ngz pushed a commit to branch tex-team in repository guix. commit ab3a02cf248cc61cf466ae999e3da54baf1412eb Author: Nicolas Goaziou <m...@nicolasgoaziou.fr> AuthorDate: Wed May 8 14:42:36 2024 +0200
gnu: texlive-libkpathsea: Fix TEXMFCACHE location. * gnu/packages/tex.scm (texlive-libkpathsea)[arguments]<#:phases>: Set TEXMFCACHE in "texmf.cnf" to "$HOME/.texliveYYYY/texmf-var/" instead of "{$GUIX_TEXMF}", which creates a "{" directory in the current working directory. * guix/build/texlive-build-system.scm (build): Set TEXMFCACHE to a local directory since $HOME is not available during build. Change-Id: I4dfa8fd2151d0ca3db788633e70d8e26b9289d89 --- gnu/packages/tex.scm | 6 +++++- guix/build/texlive-build-system.scm | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4e46c1a898..91b0393641 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Vincent Legoll <vincent.leg...@gmail.com> ;;; Copyright © 2020, 2021 Paul Garlick <pgarl...@tourbillion-technology.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.courno...@gmail.com> -;;; Copyright © 2021-2023 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2021-2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2021 Leo Le Bouter <lle-b...@zaclys.net> ;;; Copyright © 2021 Xinglu Chen <pub...@yoctocell.xyz> ;;; Copyright © 2021 Ivan Gankevich <i.gankev...@spbu.ru> @@ -224,6 +224,10 @@ "TEXMF = {$GUIX_TEXMF}\n") (("\\$SELFAUTOLOC(/share/texmf-dist/web2c)" _ suffix) (string-append #$output suffix)) + ;; Ignore system-wide cache. Use local one, by default + ;; "$HOME/.texliveYYYY/texmf-var/". + (("^TEXMFCACHE = .*") + "TEXMFCACHE = $TEXMFVAR\n") ;; Don't truncate lines. (("^error_line = .*$") "error_line = 254\n") (("^half_error_line = .*$") "half_error_line = 238\n") diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm index a9fe9c80cc..abfa1e3406 100644 --- a/guix/build/texlive-build-system.scm +++ b/guix/build/texlive-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com> ;;; Copyright © 2021 Thiago Jung Bauermann <bauerm...@kolabnow.com> -;;; Copyright © 2023 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2023, 2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -215,6 +215,9 @@ runfile to replace. If a file has no matching runfile, it is ignored." (files files))) (else '())))) (unless (null? targets) + ;; Default cache is located in $HOME, which is not set during build. + ;; Use current working directory instead. + (setenv "TEXMFCACHE" "texmf-cache/") (let ((output (string-append (getcwd) "/build"))) (mkdir-p output) (for-each (lambda (target)