[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/97: gnu: texlive-libkpathsea: Fix TEXMFCACHE location.
From: |
guix-commits |
Subject: |
01/97: gnu: texlive-libkpathsea: Fix TEXMFCACHE location. |
Date: |
Fri, 21 Jun 2024 08:22:37 -0400 (EDT) |
ngz pushed a commit to branch tex-team
in repository guix.
commit 214129956fd6c60b895d622954583c01d503462c
Author: Nicolas Goaziou <mail@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 (set-texmfvar): New function.
(%standard-phases): Add SET-TEXMFVAR phase.
Change-Id: Idff2fd5279e12d35683c863528aac3b5efa9b22b
---
gnu/packages/tex.scm | 6 +++++-
guix/build/texlive-build-system.scm | 9 ++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 828bcde0e2..f94af606e1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@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..4a1afc709b 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
-;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2023, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -91,6 +91,12 @@ runfile to replace. If a file has no matching runfile, it
is ignored."
((command-regexp _ command)
(which command))))))
+(define* (set-texmfvar #:rest _)
+ "Set TEXMFVAR to a writable location."
+ ;; Default value is relative to $HOME, which is not set during build. This
+ ;; location is used for generating font metrics or building documentation.
+ (setenv "TEXMFVAR" (string-append (getcwd) "/texmf-var")))
+
(define* (delete-drv-files #:rest _)
"Delete pre-generated \".drv\" files in order to prevent build failures."
(when (file-exists? "source")
@@ -289,6 +295,7 @@ runfile to replace. If a file has no matching runfile, it
is ignored."
(delete 'bootstrap)
(delete 'configure)
(add-after 'unpack 'patch-shell-scripts patch-shell-scripts)
+ (add-before 'build 'set-texmfvar set-texmfvar)
(add-before 'build 'delete-drv-files delete-drv-files)
(add-after 'delete-drv-files 'generate-font-metrics generate-font-metrics)
(replace 'build build)
- branch tex-team created (now e7a26e5392), guix-commits, 2024/06/21
- 06/97: gnu: texlive-luatex: Set proper default values for "texmfcnf.lua"., guix-commits, 2024/06/21
- 04/97: gnu: texlive-libkpathsea: Use TEXLIVE-SOURCE., guix-commits, 2024/06/21
- 13/97: gnu: texlive-csplain: Fix build., guix-commits, 2024/06/21
- 11/97: gnu: tex.scm: Remove completed TODO., guix-commits, 2024/06/21
- 16/97: gnu: Add texlive-omegaware-bin., guix-commits, 2024/06/21
- 18/97: gnu: Add texlive-texware-bin., guix-commits, 2024/06/21
- 09/97: gnu: Add texlive-libptexenc., guix-commits, 2024/06/21
- 17/97: gnu: Add texlive-fontware-bin., guix-commits, 2024/06/21
- 01/97: gnu: texlive-libkpathsea: Fix TEXMFCACHE location.,
guix-commits <=
- 07/97: gnu: texlive-updmap.cfg: Fix font file creation in $HOME., guix-commits, 2024/06/21
- 08/97: gnu: texlive-context: Fix "context" call., guix-commits, 2024/06/21
- 05/97: gnu: texlive-libkpathsea: Better default values in "texmf.cnf"., guix-commits, 2024/06/21
- 12/97: gnu: texlive-xcjk2uni: Fix build., guix-commits, 2024/06/21
- 10/97: gnu: texlive-bin: Minimize build surface., guix-commits, 2024/06/21
- 15/97: gnu: Add texlive-mfware-bin., guix-commits, 2024/06/21
- 20/97: gnu: Add texlive-uptex-bin., guix-commits, 2024/06/21
- 21/97: gnu: Add texlive-ptex-bin., guix-commits, 2024/06/21
- 22/97: gnu: Add texlive-bibtex-bin., guix-commits, 2024/06/21
- 23/97: gnu: Add texlive-dvicopy-bin., guix-commits, 2024/06/21