From 85e670d377c3aa886c4dee3573d7aed7a7576b69 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 18 Dec 2022 13:53:24 +0000 Subject: [PATCH] texlive.combine: use environment variables where possible --- pkgs/tools/typesetting/tex/texlive/combine.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 5688b7114460..012f03d0e120 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -143,7 +143,7 @@ in (buildEnv { [[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname" done [[ -e "$out"/share/texmf/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i "$out"/share/texmf/tex/generic/config/language.dat.lua - [[ -e "$out"/share/texmf/web2c/fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i "$out"/share/texmf/web2c/fmtutil.cnf + [[ -e "$TEXMFCNF"/fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i "$TEXMFCNF"/fmtutil.cnf '') + # function to wrap created executables with required env vars @@ -207,13 +207,13 @@ in (buildEnv { # tex intentionally ignores SOURCE_DATE_EPOCH even when FORCE_SOURCE_DATE=1 # https://salsa.debian.org/live-team/live-build/-/blob/master/examples/hooks/reproducible/0139-reproducible-texlive-binaries-fmt-files.hook.chroot#L52 - if [[ -f "$out"/share/texmf-var/web2c/tex/tex.fmt ]] + if [[ -f "$TEXMFSYSVAR"/web2c/tex/tex.fmt ]] then - faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) tex -output-directory "$out"/share/texmf-var/web2c/tex -ini -jobname=tex -progname=tex tex.ini + faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) tex -output-directory "$TEXMFSYSVAR"/web2c/tex -ini -jobname=tex -progname=tex tex.ini fi - if [[ -f "$out"/share/texmf-var/web2c/luahbtex/lualatex.fmt ]] + if [[ -f "$TEXMFSYSVAR"/web2c/luahbtex/lualatex.fmt ]] then - faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) luahbtex --output-directory="out"/share/texmf-var/web2c/luahbtex -ini -jobname=lualatex -progname=lualatex lualatex.ini + faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) luahbtex --output-directory="$TEXMFSYSVAR"/web2c/luahbtex -ini -jobname=lualatex -progname=lualatex lualatex.ini fi # Disable unavailable map files