diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2026-04-01 22:00:21 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2026-04-12 23:15:28 +0200 |
| commit | 2434428c2890c3f83c56a24adcf4ec04fc5d81c8 (patch) | |
| tree | 23d39f9b1c75e0d8809ad1c27eb6e34aa6812ace /guix | |
| parent | 2d7f403979b537e8b5585970ed3bf3710ff616de (diff) | |
guix: texlive build system: Relax Metafont requirement.
* guix/build/texlive-build-system.scm (generate-font-metrics): Cater for
texlive-metafont both as a native input and as an argument from texlive-local-tree.
Change-Id: I32dd86d49ebcb49efd2a253c0491926e0333d3f4
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/texlive-build-system.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm index 92601e9b09..ab731d35aa 100644 --- a/guix/build/texlive-build-system.scm +++ b/guix/build/texlive-build-system.scm @@ -139,11 +139,11 @@ generation also needs to be wrapped within a `faketime' call in the (local-sources (font-sources "fonts/source" local-metrics)) ((not (null? local-sources))) ;nothing to generate: bail out (root (getcwd)) + ;; "texlive-metafont" may be a native input, or included in + ;; `texlive-local-tree'. Handle both cases. (metafont - (cond ((assoc-ref (or native-inputs inputs) "texlive-metafont") => - (cut string-append <> "/share/texmf-dist")) - (else - (error "Missing 'texlive-metafont' native input")))) + (search-input-directory (or native-inputs inputs) + "share/texmf-dist/metafont")) ;; Collect all font source files from texlive (native-)inputs so ;; "mf" can know where to look for them. (font-inputs @@ -151,21 +151,21 @@ generation also needs to be wrapped within a `faketime' call in the (append-map (match-lambda ((? (negate texlive-input?)) '()) (("texlive-bin" . _) '()) - (("texlive-metafont" . _) - (list (string-append metafont "/metafont/base"))) + (("texlive-metafont" . _) '()) ((_ . input) (font-sources input #f))) (or native-inputs inputs))))) ;; Tell mf where to find "mf.base". - (setenv "MFBASES" (string-append metafont "/web2c/")) + (setenv "MFBASES" (in-vicinity metafont "../web2c")) (mkdir-p "build") (for-each (lambda (source) ;; Tell "mf" where are the font source files. In case current package ;; provides multiple sources, treat them separately. (setenv "MFINPUTS" - (string-join (cons (string-append root "/" source) - font-inputs) + (string-join (cons* (string-append root "/" source) + (in-vicinity metafont "base") + font-inputs) ":")) ;; Build font metrics (tfm). (with-directory-excursion source |