diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 16:52:20 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-29 13:35:47 -0500 |
| commit | 57fad03c4ff8c40505ec0416a21a103f4d2ad83e (patch) | |
| tree | e30c8635d19d0f1af4767bf726a6fe0a49630a45 /gnu/packages | |
| parent | 04a0b1e09abce99857e7930336421ca6d15ae630 (diff) | |
| download | guix-patches-57fad03c4ff8c40505ec0416a21a103f4d2ad83e.tar guix-patches-57fad03c4ff8c40505ec0416a21a103f4d2ad83e.tar.gz | |
gnu: texlive-amsfonts: Adjust to build with texlive-updmap.cfg.
* gnu/packages/tex.scm (texlive-amsfonts)[phases]
{build-fonts}: Do not set SOURCE_DATE_EPOCH, already done by the build
system. Let resources be auto-discovered by TeX Live machinery by simply
setting GUIX_TEXMF. Remove references to the texlive-union input. Remove
trailing #t.
{install-generated-fonts}: Remove trailing #t.
[native-inputs]: Replace texlive-union by texlive-updmap.cfg. Remove the
texlive-cm and texlive-metafont arguments of texlive-updmap.cfg.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/tex.scm | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fb61a6c1ba..3d7aed30c7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1245,22 +1245,11 @@ Taco Hoekwater.") `(modify-phases ,phases (add-before 'build 'build-fonts (lambda* (#:key inputs #:allow-other-keys) - (let ((mf (assoc-ref inputs "texlive-union")) - (src (string-append (getcwd) "/fonts/source/public/amsfonts/"))) - ;; Make METAFONT reproducible - (setenv "SOURCE_DATE_EPOCH" "1") - ;; Tell mf where to find mf.base - (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) - ;; Tell mf where to look for source files - (setenv "MFINPUTS" - (string-append src ":" - src "/cmextra:" - src "/cyrillic:" - src "/dummy:" - src "/symbols:" - mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-cm") - "/share/texmf-dist/fonts/source/public/cm"))) + ;; Allow self fonts sources and other resources to be + ;; discovered. + (setenv "GUIX_TEXMF" (string-append (getenv "GUIX_TEXMF") + ":" (getcwd))) + (let ((build (string-append (getcwd) "/build-fonts"))) (mkdir-p build) (with-directory-excursion "fonts/source/public/amsfonts" @@ -1295,10 +1284,9 @@ Taco Hoekwater.") ;; eufm10.afm to eufm8.pl, and then generate the tfm file from ;; the pl file. (setenv "TEXINPUTS" - (string-append build "//:" + (string-append ":" build "//:" (getcwd) "/fonts/afm/public/amsfonts//:" - (getcwd) "/source/latex/amsfonts//:" - (assoc-ref inputs "texlive-union") "//")) + (getcwd) "/source/latex/amsfonts//:")) (with-directory-excursion build (for-each (match-lambda (((target-base target-size) @@ -1333,19 +1321,16 @@ Taco Hoekwater.") (("eurm6" 6) ("eurm7" 7)) (("eurm8" 8) ("eurm10" 10)) - (("eurm9" 9) ("eurm10" 10)))))) - #t)) + (("eurm9" 9) ("eurm10" 10)))))))) (add-after 'install 'install-generated-fonts (lambda* (#:key inputs outputs #:allow-other-keys) (copy-recursively "build-fonts" (string-append (assoc-ref outputs "out") - "/share/texmf-dist/fonts/tfm/public/amsfonts")) - #t)))))) + "/share/texmf-dist/fonts/tfm/public/amsfonts")))))))) (native-inputs - `(("texlive-union" ,(texlive-union (list texlive-tex-fontinst-base - texlive-cm - texlive-metafont))))) + `(("texlive-updmap.cfg" ,(texlive-updmap.cfg + (list texlive-fontinst))))) (home-page "https://www.ctan.org/pkg/amsfonts") (synopsis "TeX fonts from the American Mathematical Society") (description |