about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/typesetting
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/typesetting')
-rw-r--r--nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix4
-rw-r--r--nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.patch15
2 files changed, 1 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
index 1a0a9b877bfe..69fde7784f59 100644
--- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -126,8 +126,6 @@ in buildEnv {
       patchCnfLua "./texmfcnf.lua"
 
       mkdir $out/share/texmf-local
-
-      rm updmap.cfg
     )
   '' +
     # updmap.cfg seems like not needing changes
@@ -216,7 +214,7 @@ in buildEnv {
     texlinks.sh "$out/bin" && wrapBin
     (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose
     #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links?
-    perl `type -P updmap.pl` --sys --syncwithtrees --force
+    echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force
     perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure
   '' +
     # install (wrappers for) scripts, based on a list from upstream texlive
diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.patch b/nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.patch
deleted file mode 100644
index 613fa819e12a..000000000000
--- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/texlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't overwrite already existing files!
-
-diff --git a/texmf-dist/scripts/texlive/texlinks.sh b/texmf-dist/scripts/texlive/texlinks.sh
-index 91540ea..9b1d7ed 100755
---- a/texmf-dist/scripts/texlive/texlinks.sh
-+++ b/texmf-dist/scripts/texlive/texlinks.sh
-@@ -157,7 +157,7 @@ install_link()
-       verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
-       ;;
-     *)
--      test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-+      test ! -f "$src" &&
-         rm -f "$src"
-   
-       if test -f "$src"; then