git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75335 from veprbl/pr/texlive-bin-dvisvgm_fix

texlive.bin.dvisvgm: fix

commit9e58ecd4ad0fffd5c71ddf17b26bd519810f02bb authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateWed 11 Dec 2019, 00:21 (7 years ago) parentd157c972f637f4
2 files changed+32−1
pkgs/tools/typesetting/tex/texlive/bin.nix+16−1 pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch+16
pkgs/tools/typesetting/tex/texlive/bin.nix+16−1
@@ -261,9 +261,24 @@ dvisvgm = stdenv.mkDerivation {
261261
262262 inherit (common) src;
263263
264+ patches = [
265+ # Fix for ghostscript>=9.27
266+ # Backport of
267+ # https://github.com/mgieseki/dvisvgm/commit/bc51951bc90b700c28ea018993bdb058e5271e9b
268+ ./dvisvgm-fix.patch
269+
270+ # Needed for ghostscript>=9.50
271+ (fetchpatch {
272+ url = "https://github.com/mgieseki/dvisvgm/commit/7b93a9197b69305429183affd24fa40ee04a663a.patch";
273+ sha256 = "1gmj76ja9xng39wxckhs9q140abixgb8rkrcfv2cdgq786wm3vag";
274+ stripLen = 1;
275+ extraPrefix = "texk/dvisvgm/dvisvgm-src/";
276+ })
277+ ];
278+
264279 nativeBuildInputs = [ pkgconfig ];
265280 # TODO: dvisvgm still uses vendored dependencies
266− buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype potrace xxHash ];
281+ buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ];
267282
268283 preConfigure = "cd texk/dvisvgm";
269284
pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patchnew file+16
@@ -0,0 +1,16 @@
1+diff a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
2+--- a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
3++++ b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp
4+@@ -107,8 +107,7 @@ const char *PSInterpreter::PSDEFS =
5+ "dmode sysexec<</Normal 0/Compatible 0/Multiply 1/Screen 2/Overlay 3/SoftLight "
6+ "4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8/Lighten 9/Difference 10/Exclus"
7+ "ion 11/Hue 12/Saturation 13/Color 14/Luminosity 15/CompatibleOverprint 16>>exc"
8+-"h get 1(setblendmode)prcmd}def/@pdfpagecount{GS_PDF_ProcSet begin pdfdict begi"
9+-"n(r)file pdfopen begin pdfpagecount currentdict pdfclose end end end}def/@pdfp"
10+-"agebox{GS_PDF_ProcSet begin pdfdict begin(r)file pdfopen begin dup dup 1 lt ex"
11+-"ch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse curre"
12+-"ntdict pdfclose end end end}def DELAYBIND{.bindnow}if ";
13++"h get 1(setblendmode)prcmd}def/@pdfpagecount{(r)file runpdfbegin pdfpagecount "
14++"runpdfend}def/@pdfpagebox{(r)file runpdfbegin dup dup 1 lt exch pdfpagecount g"
15++"t or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse runpdfend}def DELAYBIN"
16++"D{.bindnow}if ";