[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/111: gnu: texlive-union: Build font maps.
From: |
guix-commits |
Subject: |
01/111: gnu: texlive-union: Build font maps. |
Date: |
Tue, 16 Jul 2019 09:20:45 -0400 (EDT) |
rekado pushed a commit to branch wip-texlive
in repository guix.
commit fca2bc2d3821c0789720ef03e7fdaac605a1fe6f
Author: Ricardo Wurmus <address@hidden>
Date: Fri Jul 5 17:48:45 2019 +0200
gnu: texlive-union: Build font maps.
* gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to
generate
missing font maps.
[native-inputs]: Add coreutils, sed, and updmap.cfg.
---
gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec35315..85c72e0 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2387,16 +2387,18 @@ standard LaTeX packages."
#:builder
(begin
(use-modules (ice-9 match)
+ (ice-9 popen)
(srfi srfi-26)
(guix build union)
(guix build utils)
(guix build texlive-build-system))
(let* ((out (assoc-ref %outputs "out"))
(texmf.cnf (string-append out
"/share/texmf-dist/web2c/texmf.cnf")))
- ;; Build a modifiable union of all inputs (but exclude bash)
+ ;; Build a modifiable union of all inputs (but exclude bash and
+ ;; the updmap.cfg file)
(match (filter (match-lambda
((name . _)
- (not (string=? "bash" name))))
+ (not (member name '("bash" "updmap.cfg")))))
%build-inputs)
(((names . directories) ...)
(union-build (assoc-ref %outputs "out")
@@ -2413,19 +2415,47 @@ standard LaTeX packages."
(string-append "TEXMFROOT = " out "/share\n"))
(("^TEXMF = .*")
"TEXMF = $TEXMFROOT/share/texmf-dist\n"))
- (setenv "PATH" (string-append (assoc-ref %build-inputs "bash")
- "/bin"))
+ (setenv "PATH" (string-append
+ (assoc-ref %build-inputs "bash") "/bin:"
+ (assoc-ref %build-inputs "coreutils") "/bin:"
+ (string-append out "/bin")))
(for-each
(cut wrap-program <>
`("TEXMFCNF" ":" suffix (,(dirname texmf.cnf)))
`("TEXMF" ":" suffix (,(string-append out
"/share/texmf-dist"))))
(find-files (string-append out "/bin") ".*"))
+
+ ;; Remove invalid maps from config file.
+ (let ((port (open-pipe* OPEN_WRITE "updmap-sys"
+ "--syncwithtrees"
+ "--nohash"
+ (assoc-ref %build-inputs
"updmap.cfg"))))
+ (display "Y\n" port)
+ (when (not (zero? (status:exit-val (close-pipe port))))
+ (error "failed to filter updmap.cfg")))
+ ;; Generate maps.
+ (invoke "updmap-sys" "--force"
+ (string-append out
"/share/texmf-config/web2c/updmap.cfg"))
#t))))
(inputs
`(("bash" ,bash)
,@(map (lambda (package)
(list (package-name package) package))
(append default-packages packages))))
+ (native-inputs
+ `(("coreutils" ,coreutils)
+ ("sed" ,sed)
+ ("updmap.cfg"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://tug.org/svn/texlive/tags/"
+ %texlive-tag
"/Master/texmf-dist/web2c/updmap.cfg"
+ "?revision=" (number->string
%texlive-revision)))
+ (file-name (string-append "updmap.cfg-"
+ (number->string %texlive-revision)))
+ (sha256
+ (base32
+ "06mwpy5i218g5k3sf4gba0fmxgas82hkzx9fhwn67z5ik37d8apq"))))))
(home-page (package-home-page texlive-bin))
(synopsis "Union of TeX Live packages")
(description "This package provides a subset of the TeX Live
- branch wip-texlive created (now 9736df7), guix-commits, 2019/07/16
- 02/111: build: svn-fetch: Use "svn export"., guix-commits, 2019/07/16
- 01/111: gnu: texlive-union: Build font maps.,
guix-commits <=
- 04/111: build-system/texlive: Add texlive-origin., guix-commits, 2019/07/16
- 05/111: gnu: Add simple-texlive-package., guix-commits, 2019/07/16
- 06/111: gnu: Add hyph-utf8-scripts., guix-commits, 2019/07/16
- 09/111: gnu: Add texlive-hyphen-base., guix-commits, 2019/07/16
- 11/111: gnu: Add texlive-dehyph-exptl., guix-commits, 2019/07/16
- 13/111: gnu: texlive-fonts-cm: Remove cm-type1., guix-commits, 2019/07/16
- 03/111: guix: Add svn-multi-reference., guix-commits, 2019/07/16
- 08/111: gnu: Add texlive-unicode-data., guix-commits, 2019/07/16
- 12/111: gnu: texlive-dvips: Implement with simple-texlive-package., guix-commits, 2019/07/16
- 16/111: gnu: Add texlive-hyphen-afrikaans., guix-commits, 2019/07/16