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

texlive.bin.core-big: use postPatch from .core

Browse Source 
Otherwise it wouldn't build with new poppler either.
(Perhaps not all of it is needed here, but why not apply it all?)
This commit is contained in:
Vladimír Čunát 2018-12-25 10:21:36 +01:00
parent 76725778ce
commit e16ec2920a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -48,6 +48,17 @@ let
sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n"; sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
}) })
]; ];
postPatch = ''
for i in texk/kpathsea/mktex*; do
sed -i '/^mydir=/d' "$i"
done
cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc
cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
# fix build with poppler 0.71
find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i
'';
# remove when removing synctex-missing-header.patch # remove when removing synctex-missing-header.patch
preAutoreconf = "pushd texk/web2c"; preAutoreconf = "pushd texk/web2c";
postAutoreconf = "popd"; postAutoreconf = "popd";
@ -82,7 +93,7 @@ texliveYear = year;
core = stdenv.mkDerivation rec { core = stdenv.mkDerivation rec {
name = "texlive-bin-${version}"; name = "texlive-bin-${version}";
inherit (common) src patches preAutoreconf postAutoreconf; inherit (common) src patches postPatch preAutoreconf postAutoreconf;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
@ -95,16 +106,6 @@ core = stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
postPatch = ''
for i in texk/kpathsea/mktex*; do
sed -i '/^mydir=/d' "$i"
done
cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc
cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
# fix build with poppler 0.71
find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i
'';
preConfigure = '' preConfigure = ''
rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \
libs/{mpfr,pixman,poppler,potrace,xpdf,zlib,zziplib} libs/{mpfr,pixman,poppler,potrace,xpdf,zlib,zziplib}
@ -184,7 +185,7 @@ inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex core-big = stdenv.mkDerivation { #TODO: upmendex
name = "texlive-core-big.bin-${version}"; name = "texlive-core-big.bin-${version}";
inherit (common) src patches preAutoreconf postAutoreconf; inherit (common) src patches postPatch preAutoreconf postAutoreconf;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];