diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-29 22:51:23 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-29 22:51:23 +0200 |
| commit | f1728d43460e63b106dd446e70001d8e100eaf6d (patch) | |
| tree | 9d211fabf9e200743be49e25d108d58ed88d2f60 /gnu/packages/tex.scm | |
| parent | cda7f4bc8ecf331d623c7d37b01931a46830c648 (diff) | |
| parent | 373cc3b74a6ad33fddf75c2d773a97b1775bda8e (diff) | |
| download | guix-f1728d43460e63b106dd446e70001d8e100eaf6d.tar guix-f1728d43460e63b106dd446e70001d8e100eaf6d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tex.scm')
| -rw-r--r-- | gnu/packages/tex.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6ce36f871d..98fc9f0921 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -175,21 +175,24 @@ (string-prefix? "mips64" s)))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-code-for-new-poppler - (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc" - "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" - "texk/web2c/pdftexdir/pdftosrc.cc") - #t)) - (add-after 'unpack 'fix-unix-detection + (add-after 'unpack 'configure-ghostscript-executable ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, ;; and the "gs" ghostscript executable on Unix. It detects Unix by ;; checking for the existence of the /usr/bin directory. Since ;; GuixSD does not have /usr/bin, it is also detected as Windows. - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" (("gswin32c") "gs")) + (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl" + (("\"gs\"") + (string-append "\"" (assoc-ref inputs "ghostscript") "/bin/gs\""))) + #t)) + (add-after 'unpack 'use-code-for-new-poppler + (lambda _ + (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc" + "texk/web2c/pdftexdir/pdftoepdf.cc") + (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" + "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'install 'postint (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) |