ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123242 from xworld21/eukleides-texlive-deps-instead-of-buildinputs

Browse Source
This commit is contained in:
Sandro 2021-06-21 11:57:06 +02:00 committed by GitHub
commit 5f3ebbc661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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, 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";

10
pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch Normal file
View File

@ -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

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

@ -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 { };