guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/10: gnu: emacs-auctex: Fix build.


From: guix-commits
Subject: 03/10: gnu: emacs-auctex: Fix build.
Date: Sat, 8 Jul 2023 06:29:21 -0400 (EDT)

ngz pushed a commit to branch tex-team-next
in repository guix.

commit 91de1601b1cdd68451c94af86d9265e6a8a930ef
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri Jul 7 23:32:56 2023 +0200

    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(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d6f5667a50..04cf4e7ad9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3934,28 +3934,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/";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]