diff options
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 9aa2cde0f3c..60bbe8f28b2 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -104,7 +104,7 @@ core = stdenv.mkDerivation rec { # TODO: perhaps improve texmf.cnf search locations postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' - PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + PATH="$out/bin:$PATH" ${texlinks}/bin/texlinks --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" @@ -360,7 +360,7 @@ pygmentex = python3Packages.buildPythonApplication rec { texlinks = stdenv.mkDerivation rec { - name = "texlinks.sh"; + name = "texlinks"; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); @@ -373,7 +373,7 @@ texlinks = stdenv.mkDerivation rec { # Patch texlinks.sh back to 2015 version; # otherwise some bin/ links break, e.g. xe(la)tex. patch --verbose -R scripts/texlive-extra/texlinks.sh < '${./texlinks.diff}' - install -Dm555 scripts/texlive-extra/texlinks.sh "$out" + install -Dm555 scripts/texlive-extra/texlinks.sh "$out"/bin/texlinks runHook postInstall ''; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 9569ec88854..1d6fcfa67fd 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -224,9 +224,9 @@ in (buildEnv { ln -sf fmtutil "$out/bin/mktexfmt" perl `type -P mktexlsr.pl` ./share/texmf - ${bin.texlinks} "$out/bin" && wrapBin + ${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose - #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links? + #${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force |