public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14681 from jraygauthier/jrg/fix_context_by_patching_luascript_rebased

Browse Source 
texlive.combine: also patch `texmfcnf.lua`
This commit is contained in:
zimbatm 2016-05-09 14:37:33 +01:00
commit 9cc724e570
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/tools/typesetting/tex/texlive-new/combine.nix
View File

@ -60,21 +60,37 @@ in buildEnv {
+ +
'' ''
export PATH="$out/bin:$out/share/texmf/scripts/texlive:${perl}/bin:$PATH" export PATH="$out/bin:$out/share/texmf/scripts/texlive:${perl}/bin:$PATH"
export TEXMFCNF="$out/share/texmf/web2c"
export TEXMFDIST="$out/share/texmf"
export TEXMFSYSCONFIG="$out/share/texmf-config"
export TEXMFSYSVAR="$out/share/texmf-var"
export PERL5LIB="$out/share/texmf/scripts/texlive" export PERL5LIB="$out/share/texmf/scripts/texlive"
'' + '' +
# patch texmf-dist -> texmf to be sure # patch texmf-{dist,local} -> texmf to be sure
# TODO: cleanup the search paths incl. SELFAUTOLOC, and perhaps do lua actions? # TODO: perhaps do lua actions?
# tried inspiration from install-tl, sub do_texmf_cnf # tried inspiration from install-tl, sub do_texmf_cnf
'' ''
( (
cd ./share/texmf/web2c/ cd ./share/texmf/web2c/
local cnfOrig="$(realpath ./texmf.cnf)" local cnfOrig="$(realpath ./texmf.cnf)"
rm ./texmf.cnf rm ./texmf.cnf
cat "$cnfOrig" | sed 's/texmf-dist/texmf/g' > ./texmf.cnf sed \
-e 's,texmf-dist,texmf,g' \
-e 's,texmf-local,texmf,g' \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,\$SELFAUTODIR,$out/share,g" \
-e "s,\$SELFAUTOPARENT,$out/share,g" \
-e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \
"$cnfOrig" > ./texmf.cnf
local cnfLuaOrig="$(realpath ./texmfcnf.lua)"
rm ./texmfcnf.lua
sed \
-e 's,texmf-dist,texmf,g' \
-e 's,texmf-local,texmf,g' \
-e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf\",g" \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,selfautodir:/,$out/share/,g" \
-e "s,selfautodir:,$out/share/,g" \
-e "s,selfautoparent:/,$out/share/,g" \
-e "s,selfautoparent:,$out/share/,g" \
"$cnfLuaOrig" > ./texmfcnf.lua
rm updmap.cfg rm updmap.cfg
) )
@ -112,10 +128,6 @@ in buildEnv {
rm "$link" rm "$link"
makeWrapper "$target" "$link" \ makeWrapper "$target" "$link" \
--prefix PATH : "$out/bin:${perl}/bin" \ --prefix PATH : "$out/bin:${perl}/bin" \
--set TEXMFCNF "$out/share/texmf/web2c" \
--set TEXMFDIST "$out/share/texmf" \
--set TEXMFSYSCONFIG "$out/share/texmf-config" \
--set TEXMFSYSVAR "$out/share/texmf-var" \
--prefix PERL5LIB : "$out/share/texmf/scripts/texlive" --prefix PERL5LIB : "$out/share/texmf/scripts/texlive"
# avoid using non-nix shebang in $target by calling interpreter # avoid using non-nix shebang in $target by calling interpreter