10 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index e181b4ca18ea4..1964f01b07741 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pandoc perl makeWrapper ];
 
   patchPhase = ''
+    patchShebangs .
     substituteInPlace Makefile --replace "-Werror" ""
     substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
   '' + optionalString par2Support ''
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 34ca3d8487125..b54f342b3454c 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b";
   };
 
+  postPatch = ''
+    patchShebangs ./
+  '';
+
   buildInputs = [
     pkgconfig which gettext intltool
     glib gtk2
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index 81fe821441538..67f318c863e10 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ parted ];
 
   checkPhase = ''
+    patchShebangs Makefile
     make test PYTHON=${python.executable}
   '';
 
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index aea4fb8aad00b..7db7ebf96d6df 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     makeFlags="PREFIX=$out"
   '';
 
-  postBuild=''
+  patchPhase=''
     tar -xf testsuite.tar
+    patchShebangs .
   '';
 
   doCheck = true;
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index c19ccfba001c3..6f9695ba363cd 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     mkdir build
     cd build
     ../configure --prefix=$out
+    patchShebangs ../build-aux/
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index fdfcfdc73d975..0763532260a96 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch;
 
   postPatch = stdenv.lib.optionalString doCheck ''
+    patchShebangs tests
   '';
 
   buildInputs = [ libuuid ]
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index e30ce14d5e9f7..5ead0e7c8baba 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -32,6 +32,7 @@ let
       ];
       postPatch = ''
         export wineDir=$(pwd)
+        patchShebangs $wineDir/tools/
 	chmod u+w $wineDir/../git-export/debian/tools/
         patchShebangs $wineDir/../git-export/debian/tools/
         chmod -R +rwx ../git-export/
diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix
index 1dba136bda7ef..732cf7046610b 100644
--- a/pkgs/tools/security/mbox/default.nix
+++ b/pkgs/tools/security/mbox/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation {
   checkPhase = ''
     rm tests/test-*vim.sh tests/test-pip.sh
 
+    patchShebangs ./; dontPatchShebags=1
     sed -i 's|^/bin/||' tests/test-fileops.sh
 
     ./testall.sh
diff --git a/pkgs/tools/typesetting/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
index 853668c3b8aa7..f6fc640eb3f8b 100644
--- a/pkgs/tools/typesetting/tex/latex2html/default.nix
+++ b/pkgs/tools/typesetting/tex/latex2html/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tex perl ghostscript netpbm ];
 
   preConfigure = ''
+    patchShebangs .
     sed -i -e "s|#! /bin/cat|#! $(type -p cat)|" configure
     configureFlags="--with-texpath=$out/share/texmf-nix";
   '';
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 93814684bc137..48eb68242e1e2 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -12,6 +12,8 @@ in pythonPackages.buildPythonPackage rec {
   };
 
   preBuild = ''
+    patchShebangs ./tools
+
     substituteInPlace setup.py \
       --replace /usr $out \
       --replace /etc $out/etc \