colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eukleides: specify texlive dependencies instead of buildInputs

Browse Source
This commit is contained in:
Vincenzo Mantova 2021-05-23 19:02:36 +01:00
parent 5047c27e2a
commit 190ba6ee72
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/science/math/eukleides/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }:
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texlive }:
lib.fix (eukleides: stdenv.mkDerivation rec {
pname = "eukleides";
@ -14,7 +14,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
nativeBuildInputs = [ bison flex texinfo makeWrapper ];
buildInputs = [ readline texLive ];
buildInputs = [ readline ];
preConfigure = ''
substituteInPlace Makefile \
@ -32,21 +32,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
mkdir -p $out/bin
'';
postInstall = ''
wrapProgram $out/bin/euktoeps \
--set-default TEXINPUTS : \
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
wrapProgram $out/bin/euktopdf \
--set-default TEXINPUTS : \
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
'';
outputs = [ "out" "doc" "tex" ];
passthru.tlType = "run";
passthru.pkgs = [ eukleides.tex ];
passthru.pkgs = [ eukleides.tex ]
# packages needed by euktoeps, euktopdf and eukleides.sty
++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs);
meta = {
description = "Geometry Drawing Language";

1
pkgs/top-level/all-packages.nix
View File

@ -29828,7 +29828,6 @@ in
ecm = callPackage ../applications/science/math/ecm { };
eukleides = callPackage ../applications/science/math/eukleides {
texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo4;
};