Revert "Introduce patchShebangsPhase ran in preConfigurePhases"

This reverts commit 512fbb280f. See #5368
2015-01-08 10:26:49 +01:00 · 2015-01-08 10:26:49 +01:00 · 9b7b2ce8eb
commit 9b7b2ce8eb
parent 6671aff83e
86 changed files with 178 additions and 17 deletions
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@ -853,12 +853,6 @@ following:
    rewritten to paths in the Nix store.</para></listitem>
  </varlistentry>

-  <varlistentry>
-    <term><varname>dontPatchSourceShebangs</varname></term>
-    <listitem><para>Same as <varname>dontPatchShebangs</varname>, but applied
-    to the source code before configurePhase.</para></listitem>
-  </varlistentry>
-
  <varlistentry>
    <term><varname>forceShare</varname></term>
    <listitem><para>The list of directories that must be moved from
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
    sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5";
  };

+  preBuild = ''
+    patchShebangs ./install.sh
+  '';
+
  buildInputs = [ bash makeWrapper ];

  installPhase = ''
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  patchPhase = "patchShebangs .";
+
  # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
  # It have no reasons to exist in a redistribuable package
  postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@ -30,6 +30,10 @@ in stdenv.mkDerivation rec {
  
  configureFlags = [ "--disable-gsettings-convert-install" ];
  
+  preConfigure = ''
+    patchShebangs .
+  '';
+
  postInstall = ''
    mkdir -p $out/share/gsettings-schemas/$name
    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@ -16,4 +16,5 @@ stdenv.mkDerivation {

  patches = map fetchurl (import ./debian-patches.nix);

+  prePatch = "patchShebangs Scripts";
 }
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
  };

  prePatch = ''
+    patchShebangs .;
  '';

  preConfigure =  ''
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
                  libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];

  prePatch = ''
+    patchShebangs .;
  '';

  preConfigure =  ''
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@ -20,6 +20,8 @@ stdenv.mkDerivation {

  opensslPatches = optional useOpenSSL openssl.patches;

+  prePatch = "patchShebangs .";
+
  patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ];

  postPatch = ''
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ makeWrapper which go iptables rsync ];

+  preBuild = "patchShebangs ./hack";
+
  postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go'';

  installPhase = ''
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@ -28,6 +28,7 @@ stdenv.mkDerivation {
  };

  preConfigure = ''
+    patchShebangs .
    ./autogen.sh
  '';

--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
    cp resources/install/generic/run.sh $out/bin/jitsi
    chmod +x $out/bin/jitsi
    sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi
+    patchShebangs $out
  '';

  meta = {
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@ -21,6 +21,10 @@ stdenv.mkDerivation {

  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release";

+  prePatch = ''
+    patchShebangs .
+  '';
+
  # Disable the kadu plugins I wasn't able to get to work
  patchPhase = ''
    sed -i -e '/mpd_mediaplayer/d' \
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@ -71,6 +71,8 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";

  configurePhase = ''
+    patchShebangs .
+
    echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
    echo "ac_add_options --prefix='$out'" >> .mozconfig
    echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {

    # Ensure NSS installation works fine
    configureFlags="$configureFlags --with-nssdir=$out/lib"
+    patchShebangs src/gns/nss/install-nss-plugin.sh
  '';

  doCheck = false;
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@ -47,6 +47,7 @@ stdenv.mkDerivation rec {

    # Ensure NSS installation works fine
    configureFlags="$configureFlags --with-nssdir=$out/lib"
+    patchShebangs src/gns/nss/install-nss-plugin.sh

    sh contrib/pogen.sh
    sh bootstrap
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@ -9,6 +9,8 @@ stdenv.mkDerivation {

  buildInputs = [ gmp libantlr3c boost ];

+  preConfigure = "patchShebangs ./src/";
+
  doChecks = true;

  meta = with stdenv.lib; {
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@ -27,6 +27,7 @@ stdenv.mkDerivation {

  postPatch = ''
    ENV=$(type -p env)
+    patchShebangs "."
    substituteInPlace lib/Tools/env \
      --replace /usr/bin/env $ENV
    substituteInPlace lib/Tools/install \
--- a/pkgs/applications/video/cmplayer/default.nix
+++ b/pkgs/applications/video/cmplayer/default.nix
@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
                ++ optional cddaSupport libcdda
                ;

+  preConfigure = ''
+    patchShebangs ./configure
+    patchShebangs src/mpv/waf
+  '';

  configureFlags = with stdenv.lib;
                   [ "--qmake=qmake" ]
@ -63,6 +67,8 @@ stdenv.mkDerivation rec {
                   ++ optional cddaSupport "--enable-cdda"
                   ;

+  preBuild = "patchShebangs ./build-mpv";
+
  nativeBuildInputs = [ pkgconfig python2 perl ];

  enableParallelBuilding = true;
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@ -103,6 +103,10 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ yasm python3 ];

+  postConfigure = ''
+    patchShebangs TOOLS
+  '';
+
  configureFlags = with stdenv.lib;
    ''
      ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@ -97,6 +97,7 @@ stdenv.mkDerivation rec {

  configurePhase = ''
    python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"}
+    patchShebangs TOOLS
  '';

  buildPhase = ''
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
  dontStrip = true;

  buildPhase = ''
+    patchShebangs ./hack
    export AUTO_GOPATH=1
    export DOCKER_GITCOMMIT="c78088f"
    ./hack/make.sh dynbinary
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
    perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
  ];

+  postPatch = ''
+    patchShebangs .
+  '';
+
  doCheck = stdenv.system == "x86_64-linux";

  checkPhase = ''
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@ -7,12 +7,6 @@

 fixupOutputHooks+=('if [ -z "$dontPatchShebangs" ]; then patchShebangs "$prefix"; fi')

-preConfigurePhases+=" patchShebangsPhase"
-
-patchShebangsPhase() {
-    if [ -z "$dontPatchSourceShebangs" ]; then patchShebangs "."; fi
-}
-
 patchShebangs() {
    local dir="$1"
    header "patching script interpreter paths in $dir"
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
    sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
  };

+  preConfigure = "
+    patchShebangs ./configure
+    patchShebangs ./do_install
+  ";
+
  buildInputs = [ curl ];
  
  meta = with stdenv.lib; {
--- a/pkgs/desktops/cinnamon/cjs.nix
+++ b/pkgs/desktops/cinnamon/cjs.nix
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
    gobjectIntrospection
  ];

+  preBuild = "patchShebangs ./scripts";
+
  meta = {
    homepage = "http://cinnamon.linuxmint.com";
    description = "JavaScript bindings for Cinnamon" ;
--- a/pkgs/desktops/cinnamon/muffin.nix
+++ b/pkgs/desktops/cinnamon/muffin.nix
@ -25,6 +25,9 @@ stdenv.mkDerivation {
    clutter cogl zenity python
    gnome_doc_utils makeWrapper];

+  preBuild = "patchShebangs ./scripts";
+
+
  postFixup  = ''

    for f in "$out/bin/"*; do
--- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [ gnome3.libgee libxklavier ];

+  preBuild = ''
+    patchShebangs .
+  '';
+
  meta = with stdenv.lib; {
    platforms = platforms.linux;
  };
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];

  preBuild = ''
+    patchShebangs src/data-to-c.pl
    substituteInPlace data/Makefile --replace " install-keysDATA" ""
  '';

--- a/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ];

+  preConfigure = "patchShebangs .";
+
  configureFlags = [ "--enable-introspection" ];

  enableParallelBuilding = true;
--- a/pkgs/development/compilers/go/1.1-darwin.nix
+++ b/pkgs/development/compilers/go/1.1-darwin.nix
@ -22,6 +22,7 @@ stdenv.mkDerivation {
    fi
    cd go

+    patchShebangs ./ # replace /bin/bash
    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation {
    fi
    cd go

+    patchShebangs ./ # replace /bin/bash
    # !!! substituteInPlace does not seems to be effective.
    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@ -32,6 +32,7 @@ stdenv.mkDerivation {
    fi
    cd go

+    patchShebangs ./ # replace /bin/bash
    # !!! substituteInPlace does not seems to be effective.
    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@ -30,6 +30,7 @@ stdenv.mkDerivation {
    fi
    cd go

+    patchShebangs ./ # replace /bin/bash
    # !!! substituteInPlace does not seems to be effective.
    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
--- a/pkgs/development/compilers/julia/0.3.3.nix
+++ b/pkgs/development/compilers/julia/0.3.3.nix
@ -106,6 +106,8 @@ stdenv.mkDerivation rec {

    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"

+    patchShebangs . contrib
+
    export PATH="$PATH:${stdenv.cc.libc}/sbin"

    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
  # LLVM path to point into the Mono LLVM build, since it's private anyway.
  preBuild = ''
    makeFlagsArray=(INSTALL=`type -tp install`)
+    patchShebangs ./
  '' + stdenv.lib.optionalString withLLVM ''
    substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
  '';
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
  codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin";

  preConfigure = ''
+    patchShebangs .
    (
    cat ./compiler/buildinfos/buildInfos.ml.pre
    ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt 
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@ -12,6 +12,7 @@ agda.mkDerivation (self: rec {

  sourceDirectories = [ "./." ];
  buildPhase = ''
+    patchShebangs find-deps.sh
    make
  '';

--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@ -47,6 +47,7 @@ let
    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?

    preConfigure = ''
+      patchShebangs .
      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
      autoreconf -fi
    '';
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoreconfHook python boost ];

  postUnpack = "sourceRoot=\${sourceRoot}/folly";
+  preBuild = ''
+    patchShebangs build
+  '';

  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];

--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6";
  };

+  patchPhase = ''patchShebangs .'';
  buildInputs = [ perl zlib ];

  makeFlags = "CFLAGS=-fPIC";
--- a/pkgs/development/libraries/ibus/default.nix
+++ b/pkgs/development/libraries/ibus/default.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
  ];

  preBuild = ''
+    patchShebangs ./scripts
    substituteInPlace data/dconf/Makefile --replace "dconf update" "echo"
  '';

--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@ -11,6 +11,7 @@ stdenv.mkDerivation {
  };

  preConfigure = ''
+    patchShebangs ./config/
    ./config/autorun.sh
  '';

@ -24,4 +25,4 @@ stdenv.mkDerivation {
    license = stdenv.lib.licenses.asl20;
    platforms = stdenv.lib.platforms.unix;
  };
-}
+}
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@ -12,6 +12,10 @@ stdenv.mkDerivation rec {

  buildInputs = [ python ];

+  postPatch = ''
+    patchShebangs .
+  '';
+
  meta = {
    description = "A simple but powerful template language for C++";
    longDescription = ''
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
    sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs";
  };

+  preBuild = ''
+    patchShebangs .
+  '';
+
  buildInputs = [ pkgconfig glib python ];

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@ -14,6 +14,10 @@ stdenv.mkDerivation {
    sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784";
  };

+  patchPhase = ''
+    patchShebangs libsoup/
+  '';
+
  buildInputs = libintlOrEmpty ++ [ intltool python ];
  nativeBuildInputs = [ pkgconfig ];
  propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
+    patchShebangs . # fixes /usr/bin/python references
  '';

  configureFlags = [
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
    })
  ];

+  preBuild = "patchShebangs .";
+
  buildInputs = [ alsaLib help2man ];

  configureFlags = [
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ b/pkgs/development/libraries/mesa-darwin/default.nix
@ -41,6 +41,8 @@ let
      ./patches/patch-src-mapi-vgapi-Makefile.diff
    ];

+    postPatch = "patchShebangs .";
+
    configurePhase = ":";

    makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++";
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@ -38,6 +38,7 @@ stdenv.mkDerivation {
    sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d";
  };

+  prePatch = "patchShebangs .";

  patches = [
    ./static-gallium.patch
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
    ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
        (builtins.attrNames foolVars) );

-  preConfigure = stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
+  preConfigure = ''
+    patchShebangs .
+  '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
    sed '/libsystemd-login autoconfigured, but system does not appear to use systemd/s/.*/:/' -i configure
  ''
    # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@ -15,9 +15,11 @@ stdenv.mkDerivation rec {
  buildInputs = [ pcre zlib ];

  postPatch = ''
+    patchShebangs qpdf/fix-qdf
  '';

  preCheck = ''
+    patchShebangs qtest/bin/qtest-driver
  '';

  doCheck = true;
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {

  buildInputs = [ pkgconfig icu clucene_core curl ];

+  prePatch = ''
+    patchShebangs .;
+  '';
+
  configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable";

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/webkitgtk/2.4.6.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.6.nix
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {

  CC = "cc";

+  prePatch = ''
+    patchShebangs Tools/gtk
+  '';
+
  configureFlags = with stdenv.lib; [
    "--disable-geolocation"
    (optionalString enableIntrospection "--enable-introspection")
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ iyzsong koral ];
  };

+  preConfigure = "patchShebangs Tools";
+
  src = fetchurl {
    url = "http://webkitgtk.org/releases/${name}.tar.xz";
    sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji";
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
                  libtool python dbus_libs telepathy_glib vala dbus_glib
                  gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ];

+  prePatch = "patchShebangs .";
+
  patches = [ ./dbus_glib.patch ];

  patchFlags = [ "-p0" ];
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {

  createFindlibDestdir = true;

+  preConfigure = "patchShebangs ./configure.sh";
+
  configureScript = "./configure.sh";
  dontAddPrefix = "true";

--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {

  createFindlibDestdir = true;

+  preConfigure = "patchShebangs ./configure.sh";
+
  configureScript = "./configure.sh";
  dontAddPrefix = "true";

--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@ -8,6 +8,8 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
    sha256 = "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71";
  };

+  postPatch = "patchShebangs .";
+
  buildInputs = [ python pkgconfig dbus dbus_glib ]
    ++ stdenv.lib.optional doCheck dbus_tools;

--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@ -916,6 +916,14 @@ let
  ];

  otherOverrides = old: new: {
+    RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: {
+      patchPhase = "patchShebangs configure";
+    });
+
+    rpf = old.rpf.overrideDerivation (attrs: {
+      patchPhase = "patchShebangs configure";
+    });
+
    BayesXsrc = old.BayesXsrc.overrideDerivation (attrs: {
      patches = [ ./patches/BayesXsrc.patch ];
    });
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
  };

  preConfigure = ''
+    patchShebangs ./
    sed -i "s;usr/;;g" INSTALL.im
  '';

@ -24,4 +25,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ pSub ];
    platforms = platforms.linux;
  };
-}
+}
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@ -24,7 +24,9 @@ stdenv.mkDerivation {
    ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";

  preConfigure =
-    stdenv.lib.optionalString (qt4 != null)
+    ''
+      patchShebangs .
+    '' + stdenv.lib.optionalString (qt4 != null)
    ''
      echo "using QTDIR=${qt4}..."
      export QTDIR=${qt4}
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
  };

  preConfigure = ''
+    patchShebangs scripts/.
    sed -i 's;/usr;;g' INSTALL.im
    substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake
    substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
    cd source
    # Related to issue #1963
    sed -i 's/-fuse-ld=gold//g' Makefile
+    for i in util/*.pl; do
+      patchShebangs $i
+    done
+    patchShebangs util/gen-mi-enum
  '';

  makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@ -527,6 +527,8 @@ rec {
    configurePhase = ":";

    buildPhase = ''
+      patchShebangs .
+
      target=$out/${rtpPath}/youcompleteme
      mkdir -p $target
      cp -a ./ $target
--- a/pkgs/os-specific/darwin/cctools-port/default.nix
+++ b/pkgs/os-specific/darwin/cctools-port/default.nix
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  postPatch = ''
+    patchShebangs tools
    sed -i -e 's/which/type -P/' tools/*.sh
    sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh

--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@ -8,6 +8,8 @@ stdenv.mkDerivation {
    sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai";
  };

+  preConfigure = "patchShebangs ./configure";
+
  configureFlags = "--datadir=$(prefix)/data";

  meta = {
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
  };

  preConfigure = ''
+    patchShebangs .
+
    # ignore warnings
    sed -i 's/-Werror -Wall//' Makefile
  '';
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ];

+  preBuild =
+    ''
+      # Fix the "/usr/bin/env" in "calculate-relative".
+      patchShebangs .
+    '';

  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc";

--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ go ];

  buildPhase = ''
+    patchShebangs build
    ./build
  '';

--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
  #   'chrpath' is used to be able to run the tests from the source tree, but
  #   we use $LD_LIBRARY_PATH instead.
  buildPhase = ''
+    patchShebangs .
    mkdir -p "$out"
    sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.libPrefix}/site-packages\"|" -i SConstruct
    scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
  preConfigure = ''
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
    export PATH="$PATH:${stdenv.cc.libc}/sbin"
+    patchShebangs .
  '';

  meta = {
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    export ALLOW_WARNINGS=1
+    patchShebangs .
  '';

  configureFlags = "--lib-path ${gperftools}/lib";
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ b/pkgs/servers/nosql/riak/1.3.1.nix
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
    cp -R getopt riaknostic/deps
    cp -R meck riaknostic/deps
    popd
+    patchShebangs .
  '';

  buildPhase = ''
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@ -24,6 +24,7 @@ stdenv.mkDerivation {
  preConfigure = ''
    ln -s ${kernel.dev}/lib/modules/*/build $TMP/linux

+    patchShebangs .
    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
      echo "Patch /usr/include and /usr/src in $i"
      substituteInPlace $i \
--- 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 ''
--- 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
--- 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}
  '';

--- 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;
--- 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 = ''
--- 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 ]
--- 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/
--- 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
--- 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";
  '';
--- 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 \
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -1357,6 +1357,7 @@ let self = _self // overrides; _self = with self; {
      url = mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.21.tar.gz;
      sha256 = "0gca1cjy2k0mrpfnbyzm5islzfayqfvg3zzlrlm7n60p0cb48y7w";
    };
+    preConfigure = "patchShebangs .";
    meta = {
      description = "A module for creating generic methods";
      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -7213,6 +7213,10 @@ let
      sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
    };

+    preConfigure = ''
+      patchShebangs .
+    '';
+
    buildInputs = [
      self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio
    ];
@ -7581,6 +7585,7 @@ let
    propagatedBuildInputs = with self; [ pkgs.parted ];

    checkPhase = ''
+      patchShebangs Makefile
      make test PYTHON=${python.executable}
    '';