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

texlive.bin: fix for poppler 0.84

This commit is contained in:
Dmitry Kalinkin 2020-03-14 16:46:55 -04:00 committed by Jan Tojnar
parent 6187d5babc
commit af72bf0ae2
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,10 +26,7 @@ let
sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj"; sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj";
}; };
patches = [ prePatch = let
];
postPatch = let
# The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year} # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year}
# so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959 # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959
popplerVersion = "0.83.0"; popplerVersion = "0.83.0";
@ -68,11 +65,19 @@ let
done done
cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc
cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc
# poppler 0.84 compat fixups, use 0.83 files otherwise
patch -p1 -i ${./poppler84.patch}
''; '';
patches = [
# poppler 0.84 compat fixups, use 0.83 files otherwise
./poppler84.patch
(fetchpatch {
name = "texlive-poppler-0.86.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398";
sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l";
})
];
# 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";
@ -108,7 +113,7 @@ core = stdenv.mkDerivation rec {
pname = "texlive-bin"; pname = "texlive-bin";
inherit version; inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf; inherit (common) src patches prePatch preAutoreconf postAutoreconf;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
@ -201,7 +206,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
pname = "texlive-core-big.bin"; pname = "texlive-core-big.bin";
inherit version; inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf; inherit (common) src patches prePatch preAutoreconf postAutoreconf;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];