Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 39fc981fcac6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e71af274671
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 24, 2019

  1. Create texmf-local directory separate from texmf-dist. 

    Motivated by #58026
    @clefru @veprbl
    clefru authored and veprbl committed Mar 24, 2019
    Copy the full SHA
    6e71af2 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/tools/typesetting/tex/texlive/combine.nix
9 changes: 5 additions & 4 deletions pkgs/tools/typesetting/tex/texlive/combine.nix
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,8 @@ in buildEnv {
export TEXMFSYSVAR="$out/share/texmf-var"
export PERL5LIB="$out/share/texmf/scripts/texlive"
'' +
# patch texmf-{dist,local} -> texmf to be sure
# patch texmf-dist -> $out/share/texmf
# patch texmf-local -> $out/share/texmf-local
# TODO: perhaps do lua actions?
# tried inspiration from install-tl, sub do_texmf_cnf
''
@@ -99,8 +100,7 @@ in buildEnv {
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,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,selfautodir:/,$out/share/,g" \
-e "s,selfautodir:,$out/share/,g" \
@@ -116,7 +116,6 @@ in buildEnv {
rm ./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" \
@@ -126,6 +125,8 @@ in buildEnv {
patchCnfLua "./texmfcnf.lua"
mkdir $out/share/texmf-local
rm updmap.cfg
)
'' +