diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-28 10:50:37 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-04 14:49:36 +0200 |
| commit | 9d5f23f025a467015c9ca6785deb8787b7804dd7 (patch) | |
| tree | b5dba4a974e4cd8b0de3c8af2d6ea1d1676d6ce7 /pkgs | |
| parent | 16829e4bde84bdc355a68787d0e19999906ed74c (diff) | |
| download | nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar.gz nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar.bz2 nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar.lz nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar.xz nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.tar.zst nixlib-9d5f23f025a467015c9ca6785deb8787b7804dd7.zip | |
texlive: fixup some bin/ links, e.g. xe(la)tex
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/combine.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/texlinks.diff | 9 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive-new/combine.nix b/pkgs/tools/typesetting/tex/texlive-new/combine.nix index 1faf731fd76d..abfe951a33fe 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/combine.nix @@ -28,7 +28,7 @@ let ++ lib.optional (lib.any pkgNeedsPython splitBin.wrong) ruby; }; - mkUniquePkgs = pkgs: fastUnique (a: b: a < b) + mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: > # here we deal with those dummy packages needed for hyphenation filtering (map (p: if lib.isDerivation p then builtins.toPath p else "") pkgs); @@ -58,6 +58,17 @@ in buildEnv { '') pkgList.bin + + + # Patch texlinks.sh back to 2015 version; + # otherwise some bin/ links break, e.g. xe(la)tex. + '' + ( + cd "$out/share/texmf/scripts/texlive" + local target="$(readlink texlinks.sh)" + rm texlinks.sh && cp "$target" texlinks.sh + patch --verbose -R texlinks.sh < '${./texlinks.diff}' + ) + '' + '' export PATH="$out/bin:$out/share/texmf/scripts/texlive:${perl}/bin:$PATH" export TEXMFCNF="$out/share/texmf/web2c" diff --git a/pkgs/tools/typesetting/tex/texlive-new/texlinks.diff b/pkgs/tools/typesetting/tex/texlive-new/texlinks.diff new file mode 100644 index 000000000000..97770cc812f9 --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive-new/texlinks.diff @@ -0,0 +1,9 @@ +@@ -157,7 +157,7 @@ + verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)" + ;; + *) +- test ! -f "$src" && ++ test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" && + rm -f "$src" + + if test -f "$src"; then |