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:
parent
58b6c84071
commit
aafbd40577
pkgs
applications/video/dvd-slideshow
build-support
cc-wrapper
dotnetbuildhelpers
gcc-wrapper-old
development/compilers/manticore
games
servers/x11/xquartz
shells/bash
|
@ -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
2
pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
Normal file → Executable file
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!@shell@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -u
|
set -u
|
||||||
|
|
0
pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
Normal file → Executable file
0
pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
Normal file → Executable file
2
pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
Normal file → Executable file
2
pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
Normal file → Executable file
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!@shell@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -u
|
set -u
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!@shell@
|
||||||
|
|
||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
echo "Building Manticore research compiler."
|
echo "Building Manticore research compiler."
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!@shell@
|
||||||
|
|
||||||
set "$(dirname "$0")"/X11.bin "${@}"
|
set "$(dirname "$0")"/X11.bin "${@}"
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 = {
|
||||||
|
|
Loading…
Reference in a new issue