From 3729c3adf7f63f9b54e75dab8ec6f56fb7eabc82 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Jul 2023 23:32:56 +0200 Subject: gnu: emacs-auctex: Fix build. * gnu/packages/emacs-xyz.scm (emacs-auctex)[arguments]<#phases>: Use "dvipng" and "dvips" from cache. Fix destination for refcard. [native-inputs]: Add TEXLIVE-UPDMAP.CFG. --- gnu/packages/emacs-xyz.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 39c539afe7..06ba293365 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3962,28 +3962,23 @@ as a library for other Emacs packages.") (emacs-substitute-variables "preview.el" ("preview-gs-command" (search-input-file inputs "/bin/gs"))) + ;; Leave "dvipng" and "dvips" executables as-is. Otherwise, this + ;; would require to add a TeX Live system to inputs, which is + ;; much for an Emacs package. (substitute* "preview.el" - (("\"dvipng ") - (let ((dvipng (search-input-file inputs "/bin/dvipng"))) - (string-append "\"" dvipng " "))) - (("\"dvips ") - (let ((dvips (search-input-file inputs "/bin/dvips"))) - (string-append "\"" dvips " "))) (("\"pdf2dsc ") (let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc"))) (string-append "\"" pdf2dsc " ")))))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (etc-dir (string-append out "/share/" ,name "/" - ,version "/etc"))) + (doc-dir (string-append out "/share/doc/" ,name "-" ,version))) (with-directory-excursion "doc" (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm (invoke "pdftex" "tex-ref") - (install-file "tex-ref.pdf" - (string-append etc-dir "/refcards"))))))))) + (install-file "tex-ref.pdf" doc-dir)))))))) (native-inputs - (list perl)) + (list perl (texlive-updmap.cfg))) (inputs (list ghostscript)) (home-page "https://www.gnu.org/software/auctex/") -- cgit v1.2.3