1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00

Replace hard coded /bin/bash occurrences

This commit is contained in:
Markus Hauck 2016-10-01 11:17:30 +02:00
parent 58b6c84071
commit aafbd40577
10 changed files with 13 additions and 13 deletions
pkgs
applications/video/dvd-slideshow
build-support
development/compilers/manticore
games
astromenace
micropolis
servers/x11/xquartz
shells/bash

View file

@ -4,7 +4,7 @@ let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" '' wrapper = writeScript "dvd-slideshow.sh" ''
#!/bin/bash #!${stdenv.shell}
# wrapper script for dvd-slideshow programs # wrapper script for dvd-slideshow programs
export PATH=${binPath}:$PATH export PATH=${binPath}:$PATH
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
# fix upstream typos # fix upstream typos
substituteInPlace dvd-slideshow \ substituteInPlace dvd-slideshow \
--replace "version='0.8.4-1'" "version='0.8.4-2'" \ --replace "version='0.8.4-1'" "version='0.8.4-2'" \
--replace "mymyecho" "myecho" --replace "mymyecho" "myecho"
''; '';
installPhase = '' installPhase = ''

2
pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set -e set -e
set -u set -u

View file

View file

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set -e set -e
set -u set -u

View file

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
source $stdenv/setup source $stdenv/setup
echo "Building Manticore research compiler." echo "Building Manticore research compiler."

View file

@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp AstroMenace $out cp AstroMenace $out
cp gamedata.vfs $out cp gamedata.vfs $out
cat > $out/bin/AstroMenace << EOF cat > $out/bin/AstroMenace << EOF
#!/bin/bash #!${stdenv.shell}
$out/AstroMenace --dir=$out $out/AstroMenace --dir=$out
EOF EOF
chmod 755 $out/bin/AstroMenace chmod 755 $out/bin/AstroMenace

View file

@ -33,8 +33,8 @@ stdenv.mkDerivation {
cp -R $d $out/usr/share/games/micropolis cp -R $d $out/usr/share/games/micropolis
done done
cp Micropolis $out/usr/share/games/micropolis cp Micropolis $out/usr/share/games/micropolis
cat > $out/bin/micropolis << EOF cat > $out/bin/micropolis << EOF
#!/bin/bash #!${stdenv.shell}
cd $out/usr/share/games/micropolis cd $out/usr/share/games/micropolis
./Micropolis ./Micropolis
EOF EOF

View file

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
set "$(dirname "$0")"/X11.bin "${@}" set "$(dirname "$0")"/X11.bin "${@}"

View file

@ -1,4 +1,4 @@
#!/bin/bash #!@shell@
export PATH=@PATH@:$PATH export PATH=@PATH@:$PATH
@ -83,7 +83,7 @@ get_fontdirs() {
if [[ $osxfonts == 1 ]] ; then if [[ $osxfonts == 1 ]] ; then
find {/System/,/}Library/Fonts -type d find {/System/,/}Library/Fonts -type d
fi fi
else else
if [[ $osxfonts == 1 && -d "${HOME}/Library/Fonts" ]] ; then if [[ $osxfonts == 1 && -d "${HOME}/Library/Fonts" ]] ; then
find "${HOME}/Library/Fonts" -type d find "${HOME}/Library/Fonts" -type d
fi fi

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
in 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; ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
crossAttrs = { crossAttrs = {