diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-21 11:57:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-21 11:57:06 +0200 |
commit | 5f3ebbc66108d23705a01659f55688d15d7d7428 (patch) | |
tree | c9a1c798bc424cb27cff690015af9e01e49ffc65 | |
parent | 507ff55e06d6fe9a67249743c0f3df68a6841721 (diff) | |
parent | b0c6bd9211ee7a35d27a0037b388742960c3df71 (diff) | |
download | nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar.gz nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar.bz2 nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar.lz nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar.xz nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.tar.zst nixlib-5f3ebbc66108d23705a01659f55688d15d7d7428.zip |
Merge pull request #123242 from xworld21/eukleides-texlive-deps-instead-of-buildinputs
-rw-r--r-- | pkgs/applications/science/math/eukleides/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 24 insertions, 17 deletions
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index b5a9fc3fa86d..6b6bfd7d6e5f 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }: lib.fix (eukleides: stdenv.mkDerivation rec { pname = "eukleides"; @@ -9,12 +9,16 @@ lib.fix (eukleides: stdenv.mkDerivation rec { sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; - # use $CC instead of hardcoded gcc - patches = [ ./use-CC.patch ]; + patches = [ + # use $CC instead of hardcoded gcc + ./use-CC.patch + # allow PostScript transparency in epstopdf call + ./gs-allowpstransparency.patch + ]; - nativeBuildInputs = [ bison flex texinfo makeWrapper ]; + nativeBuildInputs = [ bison flex texinfo4 makeWrapper ]; - buildInputs = [ readline texLive ]; + buildInputs = [ getopt readline ]; preConfigure = '' substituteInPlace Makefile \ @@ -34,19 +38,15 @@ lib.fix (eukleides: stdenv.mkDerivation rec { 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" + --prefix PATH : ${lib.makeBinPath [ getopt ]} ''; 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"; diff --git a/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch new file mode 100644 index 000000000000..aa92e6cc9fa7 --- /dev/null +++ b/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch @@ -0,0 +1,10 @@ +--- a/bash/euktopdf ++++ b/bash/euktopdf +@@ -55,6 +55,6 @@ do + exit 1 + fi + dvips -q -E -o $base.eps $base.dvi && +- epstopdf $base.eps && ++ epstopdf --gsopt=-dALLOWPSTRANSPARENCY $base.eps && + rm -f $base.{tex,log,dvi,eps} + done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a13a0371a915..9432bd6c6899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30171,10 +30171,7 @@ in ecm = callPackage ../applications/science/math/ecm { }; - eukleides = callPackage ../applications/science/math/eukleides { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo4; - }; + eukleides = callPackage ../applications/science/math/eukleides { }; form = callPackage ../applications/science/math/form { }; |