eukleides: specify texlive dependencies instead of buildInputs

+5 -15
+5 -14
pkgs/applications/science/math/eukleides/default.nix
··· 1 - { lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: 2 3 lib.fix (eukleides: stdenv.mkDerivation rec { 4 pname = "eukleides"; ··· 14 15 nativeBuildInputs = [ bison flex texinfo makeWrapper ]; 16 17 - buildInputs = [ readline texLive ]; 18 19 preConfigure = '' 20 substituteInPlace Makefile \ ··· 32 mkdir -p $out/bin 33 ''; 34 35 - postInstall = '' 36 - wrapProgram $out/bin/euktoeps \ 37 - --set-default TEXINPUTS : \ 38 - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ 39 - --prefix PATH : "${texLive}/bin" 40 - wrapProgram $out/bin/euktopdf \ 41 - --set-default TEXINPUTS : \ 42 - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ 43 - --prefix PATH : "${texLive}/bin" 44 - ''; 45 - 46 outputs = [ "out" "doc" "tex" ]; 47 48 passthru.tlType = "run"; 49 - passthru.pkgs = [ eukleides.tex ]; 50 51 meta = { 52 description = "Geometry Drawing Language";
··· 1 + { lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texlive }: 2 3 lib.fix (eukleides: stdenv.mkDerivation rec { 4 pname = "eukleides"; ··· 14 15 nativeBuildInputs = [ bison flex texinfo makeWrapper ]; 16 17 + buildInputs = [ readline ]; 18 19 preConfigure = '' 20 substituteInPlace Makefile \ ··· 32 mkdir -p $out/bin 33 ''; 34 35 outputs = [ "out" "doc" "tex" ]; 36 37 passthru.tlType = "run"; 38 + passthru.pkgs = [ eukleides.tex ] 39 + # packages needed by euktoeps, euktopdf and eukleides.sty 40 + ++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs); 41 42 meta = { 43 description = "Geometry Drawing Language";
-1
pkgs/top-level/all-packages.nix
··· 29828 ecm = callPackage ../applications/science/math/ecm { }; 29829 29830 eukleides = callPackage ../applications/science/math/eukleides { 29831 - texLive = texlive.combine { inherit (texlive) scheme-small; }; 29832 texinfo = texinfo4; 29833 }; 29834
··· 29828 ecm = callPackage ../applications/science/math/ecm { }; 29829 29830 eukleides = callPackage ../applications/science/math/eukleides { 29831 texinfo = texinfo4; 29832 }; 29833