diff options
author | Domen Kožar <domen@dev.si> | 2015-01-08 10:26:49 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-01-08 10:26:49 +0100 |
commit | 9b7b2ce8eb855b99598183b06bbd2f021e01d359 (patch) | |
tree | 6208aca2cacac8adb19c64dc2a3d1ada2f7408ef /pkgs/applications | |
parent | 6671aff83e4082f3a825c456cf259b9e30ae702c (diff) |
Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f72980e84230b72b631258df1755919. See #5368
Diffstat (limited to 'pkgs/applications')
21 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index fb2970ed5fa5f..24613d4dd9655 100644 --- 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 = '' diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 9b3ee6d4f887b..8d4002c9ef858 100644 --- 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"; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 5f3b96ba16e3e..223f632f937d0 100644 --- 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/ diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index e53514a6c1f62..cd3a09887d0f9 100644 --- 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"; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index df6a3a271b674..41184d6e94920 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; prePatch = '' + patchShebangs .; ''; preConfigure = '' diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index bce45286d1f3e..d2739dbec5057 100644 --- 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 = '' diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index f4e54c5332365..adac4baa29cd1 100644 --- 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 = '' diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7f3eef7554c61..7931da602d6ea 100644 --- 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 = '' diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index fd545ee7f5871..320e7094d484b 100644 --- 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 ''; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 575c6c0446437..e6dd6569a55f1 100644 --- 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 = { diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index df8846c36b115..44cf13e2917cb 100644 --- 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' \ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6e628dc081cbb..e6ba7e21dc8ef 100644 --- 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 diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 2475adadefbf3..052c531125365 100644 --- 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; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 9e593975412d2..25a51b3c9365f 100644 --- 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 diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index a2618d88918f9..5b2e9c54d6f81 100644 --- 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; { diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 4b68f0e3cd6b8..88bbe820e2f33 100644 --- 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 \ diff --git a/pkgs/applications/video/cmplayer/default.nix b/pkgs/applications/video/cmplayer/default.nix index fe02f9a33011f..3fa38646d9df1 100644 --- 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; diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 6d47ed71b40ed..5827e22ea5e0d 100644 --- 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}"} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b87024303fe2e..052add92a1fef 100644 --- 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 = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 01f0542e6f4ba..3483b0ac6d207 100644 --- 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 diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index aceb7a0b13c2d..39705aca11629 100644 --- 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 = '' |