diff options
author | Markus Hauck <markus1189@gmail.com> | 2016-10-01 11:17:30 +0200 |
---|---|---|
committer | Markus Hauck <markus1189@gmail.com> | 2016-10-04 20:15:37 +0200 |
commit | aafbd405776e50ee349035b950f512a57c9fd28f (patch) | |
tree | 54de0f61ece224a12a2d1ded728d2f86e6257e2e | |
parent | 58b6c8407111a8b6b886964387ad753fd4972ab3 (diff) | |
download | nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.gz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.bz2 nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.lz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.xz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.zst nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.zip |
Replace hard coded /bin/bash occurrences
-rw-r--r-- | pkgs/applications/video/dvd-slideshow/default.nix | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh | 2 | ||||
-rwxr-xr-x | pkgs/development/compilers/manticore/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/games/astromenace/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/micropolis/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/servers/x11/xquartz/X11 | 2 | ||||
-rwxr-xr-x | pkgs/servers/x11/xquartz/font_cache | 4 | ||||
-rw-r--r-- | pkgs/shells/bash/default.nix | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 1506f6e23c90..7785116a835d 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 index 5a7b92b5ad7d..263ea5408e9a 100644..100755 --- 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 index 3f81cc73e801..3f81cc73e801 100644..100755 --- a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh +++ b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh index 5a7b92b5ad7d..263ea5408e9a 100644..100755 --- 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 8fb4ab850eb1..ad72f50a1b31 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 681fec72f969..0a7218bba72c 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 a294128969c5..57103bb9101f 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 39bcce2c10b6..e6bb87fab3fe 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 12858af8bc60..b1191980d77f 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 c6868eedba6c..76c24323fca9 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 = { |