guix-commits
[Top][All Lists]
Advanced

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

428/435: gnu: texlive-xmltex: Rely on build system to create formats.


From: guix-commits
Subject: 428/435: gnu: texlive-xmltex: Rely on build system to create formats.
Date: Tue, 6 Jun 2023 11:40:38 -0400 (EDT)

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

commit 94442c8bb83284f18de4f7fed164dab5852bf786
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun Jun 4 00:58:24 2023 +0200

    gnu: texlive-xmltex: Rely on build system to create formats.
    
    * gnu/packages/tex.scm (texlive-xmltex)[arguments]: Use #:CREATE-FORMATS.
    Remove useless phase.
    [propagated-inputs]: Remove call to TEXLIVE-UPDMAP.CFG.  Remove
    TEXLIVE-AMSFONTS, TEXLIVE-COURIER, TEXLIVE-DEHYPH, TEXLIVE-HELVETIC,
    TEXLIVE-HYPERREF, TEXLIVE-HYPHEN-BASE, TEXLIVE-HYPH-UTF8, TEXLIVE-STMARYRD,
    TEXLIVE-SYMBOL, TEXLIVE-TIMES, TEXLIVE-TIPA, TEXLIVE-WASY, TEXLIVE-ZAPFDING.
    Add TEXLIVE-HYPHEN-COMPLETE, TEXLIVE-LATEX, TEXLIVE-LATEXCONFIG,
    TEXLIVE-PDFTEX, TEXLIVE-TEX, TEXLIVE-UNICODE-DATA.
---
 gnu/packages/tex.scm | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ed27cdff7b..250aa152b2 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3756,60 +3756,34 @@ and @code{pdfxmltex}.")
     (build-system texlive-build-system)
     (arguments
      (list
+      #:create-formats #~(list "pdfxmltex" "xmltex")
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'install 'generate-formats
-            (lambda _
-              (let ((web2c (string-append (getcwd) "/web2c")))
-                (mkdir "web2c")
-                (with-directory-excursion "tex/xmltex/base/"
-                  (invoke "fmtutil-sys"
-                          "--byfmt" "xmltex"
-                          (string-append"--fmtdir=" web2c))
-                  (invoke "fmtutil-sys"
-                          "--byfmt" "pdfxmltex"
-                          (string-append "--fmtdir=" web2c))))))
-          (add-after 'install 'install-formats-and-wrappers
+          (add-after 'install 'install-wrappers
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((pdftex (search-input-file inputs "/bin/pdftex"))
                     (web2c (string-append #$output "/share/texmf-dist/web2c")))
-                (mkdir-p web2c)
-                (copy-recursively "web2c" web2c)
-                (for-each delete-file (find-files web2c "\\.log$"))
-                ;; Create convenience command wrappers.
                 (mkdir-p (string-append #$output "/bin"))
                 (symlink pdftex (string-append #$output "/bin/xmltex"))
                 (symlink pdftex (string-append #$output 
"/bin/pdfxmltex"))))))))
-    (native-inputs
-     (list texlive-tex-ini-files
-           texlive-xmltexconfig))
     (propagated-inputs
-     (list (texlive-updmap.cfg
-            (list texlive-amsfonts
-                  texlive-babel
-                  texlive-courier
-                  texlive-helvetic
-                  texlive-hyperref
-                  texlive-latex-fonts
-                  texlive-stmaryrd
-                  texlive-symbol
-                  texlive-times
-                  texlive-tipa
-                  texlive-wasy
-                  texlive-zapfding))
-           texlive-atbegshi
+     (list texlive-atbegshi
            texlive-atveryend
            texlive-babel
            texlive-cm
-           texlive-dehyph
            texlive-everyshi
            texlive-firstaid
-           texlive-hyph-utf8
-           texlive-hyphen-base
+           texlive-hyphen-complete
            texlive-l3backend
            texlive-l3kernel
            texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-latexconfig
+           texlive-pdftex
+           texlive-tex
            texlive-tex-ini-files
+           texlive-unicode-data
            texlive-xmltexconfig))
     (home-page "https://ctan.org/pkg/xmltex";)
     (synopsis "Support for parsing XML documents")



reply via email to

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