From aafbd405776e50ee349035b950f512a57c9fd28f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 1 Oct 2016 11:17:30 +0200
Subject: [PATCH] Replace hard coded /bin/bash occurrences

---
 pkgs/applications/video/dvd-slideshow/default.nix             | 4 ++--
 pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh           | 2 +-
 pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh | 0
 pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh      | 2 +-
 pkgs/development/compilers/manticore/builder.sh               | 2 +-
 pkgs/games/astromenace/default.nix                            | 4 ++--
 pkgs/games/micropolis/default.nix                             | 4 ++--
 pkgs/servers/x11/xquartz/X11                                  | 2 +-
 pkgs/servers/x11/xquartz/font_cache                           | 4 ++--
 pkgs/shells/bash/default.nix                                  | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
 mode change 100644 => 100755 pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
 mode change 100644 => 100755 pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh

diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 1506f6e23c9..7785116a835 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -4,7 +4,7 @@ let
   binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
 
   wrapper = writeScript "dvd-slideshow.sh" ''
-      #!/bin/bash
+      #!${stdenv.shell}
       # wrapper script for dvd-slideshow programs
       export PATH=${binPath}:$PATH
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
     # fix upstream typos
     substituteInPlace dvd-slideshow \
       --replace "version='0.8.4-1'" "version='0.8.4-2'" \
-      --replace "mymyecho" "myecho" 
+      --replace "mymyecho" "myecho"
   '';
 
   installPhase = ''
diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
old mode 100644
new mode 100755
index 5a7b92b5ad7..263ea5408e9
--- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@shell@
 
 set -e
 set -u
diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
old mode 100644
new mode 100755
diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
old mode 100644
new mode 100755
index 5a7b92b5ad7..263ea5408e9
--- a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@shell@
 
 set -e
 set -u
diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh
index 8fb4ab850eb..ad72f50a1b3 100755
--- a/pkgs/development/compilers/manticore/builder.sh
+++ b/pkgs/development/compilers/manticore/builder.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@shell@
 
 source $stdenv/setup
 echo "Building Manticore research compiler."
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index 681fec72f96..0a7218bba72 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp AstroMenace $out
     cp gamedata.vfs $out
-    cat > $out/bin/AstroMenace << EOF 
-    #!/bin/bash
+    cat > $out/bin/AstroMenace << EOF
+    #!${stdenv.shell}
     $out/AstroMenace --dir=$out
     EOF
     chmod 755 $out/bin/AstroMenace
diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index a294128969c..57103bb9101 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
         cp -R $d $out/usr/share/games/micropolis
       done
       cp Micropolis $out/usr/share/games/micropolis
-      cat > $out/bin/micropolis << EOF 
-      #!/bin/bash
+      cat > $out/bin/micropolis << EOF
+      #!${stdenv.shell}
       cd $out/usr/share/games/micropolis
       ./Micropolis
       EOF
diff --git a/pkgs/servers/x11/xquartz/X11 b/pkgs/servers/x11/xquartz/X11
index 39bcce2c10b..e6bb87fab3f 100755
--- a/pkgs/servers/x11/xquartz/X11
+++ b/pkgs/servers/x11/xquartz/X11
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@shell@
 
 set "$(dirname "$0")"/X11.bin "${@}"
 
diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/servers/x11/xquartz/font_cache
index 12858af8bc6..b1191980d77 100755
--- a/pkgs/servers/x11/xquartz/font_cache
+++ b/pkgs/servers/x11/xquartz/font_cache
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@shell@
 
 export PATH=@PATH@:$PATH
 
@@ -83,7 +83,7 @@ get_fontdirs() {
         if [[ $osxfonts == 1 ]] ; then
             find {/System/,/}Library/Fonts -type d
         fi
-    else 
+    else
         if [[ $osxfonts == 1 && -d "${HOME}/Library/Fonts" ]] ; then
             find "${HOME}/Library/Fonts" -type d
         fi
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index c6868eedba6..76c24323fca 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
           inherit sha256;
         };
     in
-      import ./bash-4.3-patches.nix patch) 
+      import ./bash-4.3-patches.nix patch)
       ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   crossAttrs = {