summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2013-10-14 10:36:39 +0400
committerMichael Raskin <7c6f434c@mail.ru>2013-10-14 10:58:54 +0400
commit776adb5704262ecc884fc2d003988ffb23f4df0a (patch)
treecb161dec170faf0311ee0e02e02423fff332ad1c /pkgs/build-support
parent4dee7de246e6037d494d798efd2a383d9fccc8cc (diff)
downloadnixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar.gz
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar.bz2
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar.lz
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar.xz
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.tar.zst
nixpkgs-776adb5704262ecc884fc2d003988ffb23f4df0a.zip
Updating TeXLive to 2013 using updated Debian snapshots.
Kept the old hacks where they don't break the build in case they things
they fix are still relevant.

I checked that the upgrade doesn't break:
1) Asymptote and EProver builds.
2) My XeLaTeX demo from configurations/ repository.
3) Some of my own files.

The upgrade fixes problems with simultaneous use of 3D and LaTeX labels
in Asymptote.

Please provide a test that worked previously and is broken now if you
need to revert this update or its parts.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/builder-defs/builder-defs.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 3c5d7af621c..e22aa6bc66e 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -565,13 +565,15 @@ let inherit (builtins) head tail trace; in
      # Interpreters that are already in the store are left untouched.
          echo "patching script interpreter paths"
          local f
-         for f in $(find "${dir}" -type f -perm +0100); do
+         for f in $(find "${dir}" -xtype f -perm +0100); do
              local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
              if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
                  local newPath=$(type -P $(basename $oldPath) || true)
                  if test -n "$newPath" -a "$newPath" != "$oldPath"; then
                      echo "$f: interpreter changed from $oldPath to $newPath"
                      sed -i "1 s,$oldPath,$newPath," "$f"
+		 else
+		     echo "$f: not changing interpreter from $oldPath"
                  fi
              fi
          done