summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-01-02 02:58:18 +0100
committerDomen Kožar <domen@dev.si>2015-01-02 02:58:32 +0100
commit512fbb280f72980e84230b72b631258df1755919 (patch)
tree6e10e8d2dc2ab874075123ccbc47232c7122dd0a /pkgs/applications
parentd8c5d95330d9806b3ee30569de76660f3931d5ee (diff)
downloadnixpkgs-512fbb280f72980e84230b72b631258df1755919.tar
nixpkgs-512fbb280f72980e84230b72b631258df1755919.tar.gz
nixpkgs-512fbb280f72980e84230b72b631258df1755919.tar.bz2
nixpkgs-512fbb280f72980e84230b72b631258df1755919.tar.lz
nixpkgs-512fbb280f72980e84230b72b631258df1755919.tar.xz
nixpkgs-512fbb280f72980e84230b72b631258df1755919.tar.zst
nixpkgs-512fbb280f72980e84230b72b631258df1755919.zip
Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/audio/caudec/default.nix4
-rw-r--r--pkgs/applications/editors/geany/default.nix2
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix4
-rw-r--r--pkgs/applications/graphics/xara/default.nix1
-rw-r--r--pkgs/applications/misc/bibletime/default.nix1
-rw-r--r--pkgs/applications/misc/xiphos/default.nix1
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/kubernetes/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/freetalk/default.nix1
-rw-r--r--pkgs/applications/networking/instant-messengers/jitsi/default.nix1
-rw-r--r--pkgs/applications/networking/instant-messengers/kadu/default.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/default.nix2
-rw-r--r--pkgs/applications/networking/p2p/gnunet/default.nix1
-rw-r--r--pkgs/applications/networking/p2p/gnunet/svn.nix1
-rw-r--r--pkgs/applications/science/logic/cvc4/default.nix2
-rw-r--r--pkgs/applications/science/logic/isabelle/default.nix1
-rw-r--r--pkgs/applications/video/cmplayer/default.nix6
-rw-r--r--pkgs/applications/video/mplayer2/default.nix4
-rw-r--r--pkgs/applications/video/mpv/default.nix1
-rw-r--r--pkgs/applications/virtualization/docker/default.nix1
-rw-r--r--pkgs/applications/window-managers/i3/default.nix4
21 files changed, 0 insertions, 46 deletions
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 24613d4dd96..fb2970ed5fa 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
     sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5";
   };
 
-  preBuild = ''
-    patchShebangs ./install.sh
-  '';
-
   buildInputs = [ bash makeWrapper ];
 
   installPhase = ''
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 8d4002c9ef8..9b3ee6d4f88 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -18,8 +18,6 @@ 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";
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 223f632f937..5f3b96ba16e 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -30,10 +30,6 @@ 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/
diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix
index cd3a09887d0..e53514a6c1f 100644
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@@ -16,5 +16,4 @@ stdenv.mkDerivation {
 
   patches = map fetchurl (import ./debian-patches.nix);
 
-  prePatch = "patchShebangs Scripts";
 }
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 41184d6e949..df6a3a271b6 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   };
 
   prePatch = ''
-    patchShebangs .;
   '';
 
   preConfigure =  ''
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index d2739dbec50..bce45286d1f 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
                   libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
 
   prePatch = ''
-    patchShebangs .;
   '';
 
   preConfigure =  ''
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index adac4baa29c..f4e54c53323 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation {
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
-  prePatch = "patchShebangs .";
-
   patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ];
 
   postPatch = ''
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 7931da602d6..7f3eef7554c 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper which go iptables rsync ];
 
-  preBuild = "patchShebangs ./hack";
-
   postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go'';
 
   installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 320e7094d48..fd545ee7f58 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    patchShebangs .
     ./autogen.sh
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index e6dd6569a55..575c6c04464 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -33,7 +33,6 @@ 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 = {
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 44cf13e2917..df8846c36b1 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -21,10 +21,6 @@ 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' \
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index e6ba7e21dc8..6e628dc081c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -71,8 +71,6 @@ 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
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 052c5311253..2475adadefb 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
 
     # Ensure NSS installation works fine
     configureFlags="$configureFlags --with-nssdir=$out/lib"
-    patchShebangs src/gns/nss/install-nss-plugin.sh
   '';
 
   doCheck = false;
diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index 25a51b3c936..9e593975412 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -47,7 +47,6 @@ 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
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 5b2e9c54d6f..a2618d88918 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ gmp libantlr3c boost ];
 
-  preConfigure = "patchShebangs ./src/";
-
   doChecks = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 88bbe820e2f..4b68f0e3cd6 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
 
   postPatch = ''
     ENV=$(type -p env)
-    patchShebangs "."
     substituteInPlace lib/Tools/env \
       --replace /usr/bin/env $ENV
     substituteInPlace lib/Tools/install \
diff --git a/pkgs/applications/video/cmplayer/default.nix b/pkgs/applications/video/cmplayer/default.nix
index 3fa38646d9d..fe02f9a3301 100644
--- a/pkgs/applications/video/cmplayer/default.nix
+++ b/pkgs/applications/video/cmplayer/default.nix
@@ -54,10 +54,6 @@ stdenv.mkDerivation rec {
                 ++ optional cddaSupport libcdda
                 ;
 
-  preConfigure = ''
-    patchShebangs ./configure
-    patchShebangs src/mpv/waf
-  '';
 
   configureFlags = with stdenv.lib;
                    [ "--qmake=qmake" ]
@@ -67,8 +63,6 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  preBuild = "patchShebangs ./build-mpv";
-
   nativeBuildInputs = [ pkgconfig python2 perl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index 5827e22ea5e..6d47ed71b40 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -103,10 +103,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yasm python3 ];
 
-  postConfigure = ''
-    patchShebangs TOOLS
-  '';
-
   configureFlags = with stdenv.lib;
     ''
       ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 052add92a1f..b87024303fe 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"}
-    patchShebangs TOOLS
   '';
 
   buildPhase = ''
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3483b0ac6d2..01f0542e6f4 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   buildPhase = ''
-    patchShebangs ./hack
     export AUTO_GOPATH=1
     export DOCKER_GITCOMMIT="c78088f"
     ./hack/make.sh dynbinary
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 39705aca116..aceb7a0b13c 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
     perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
   ];
 
-  postPatch = ''
-    patchShebangs .
-  '';
-
   doCheck = stdenv.system == "x86_64-linux";
 
   checkPhase = ''