diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2019-01-15 23:41:31 +0100 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2019-01-16 20:37:15 +0100 |
commit | bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 (patch) | |
tree | 26aef5b71509a26f7986e6cf9928b7687c21787d /pkgs/games | |
parent | 3956a8421f2d78bc66ad9d3c23a3b5510bc695be (diff) |
treewide: use ${stdenv.shell} instead of /bin/sh where possible
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/andyetitmoves/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/eduke32/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/freeorion/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/freeorion/fix-paths.sh | 2 | ||||
-rw-r--r-- | pkgs/games/gargoyle/darwin.sh | 2 | ||||
-rw-r--r-- | pkgs/games/gargoyle/default.nix | 13 | ||||
-rw-r--r-- | pkgs/games/mars/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/minecraft-server/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/oilrush/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/openttd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/tremulous/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/trigger/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/vessel/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/worldofgoo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/zangband/default.nix | 2 |
15 files changed, 22 insertions, 18 deletions
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 97cbe616c57c..123d4296c973 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF - #!/bin/sh + #!${stdenv.shell} cd $out/opt/andyetitmoves exec ./lib/$binName EOF diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 502a554bae22..859e503e1017 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Make wrapper script cat > eduke32-wrapper <<EOF - #!/bin/sh + #!${stdenv.shell} if [ "$EDUKE32_DATA_DIR" = "" ]; then EDUKE32_DATA_DIR=/var/lib/games/eduke32 diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index a9ebd994bb88..5895e87e731f 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { --subst-var-by out "$out/" substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \ --subst-var-by libxsltBin ${libxslt.bin} \ + --subst-var-by shell ${stdenv.shell} \ --subst-var out chmod +x $out/fixpaths/fix-paths diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh index 73a3bd6feda9..3f82533dd60d 100644 --- a/pkgs/games/freeorion/fix-paths.sh +++ b/pkgs/games/freeorion/fix-paths.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ if [ -e ~/.config/freeorion/config.xml ]; then @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh index 9bd45d0b1d54..ed0daec4ef1f 100644 --- a/pkgs/games/gargoyle/darwin.sh +++ b/pkgs/games/gargoyle/darwin.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ set -e diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 5bf0ae1c814a..c908a9b75a9c 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jam, cctools, pkgconfig +{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig , SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }: let @@ -29,16 +29,19 @@ stdenv.mkDerivation { sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; patches = [ ./darwin.patch ]; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; - installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' + installPhase = + if stdenv.isDarwin then + (substituteAll { inherit (stdenv) shell; src = ./darwin.sh; }) + else jamenv + '' jam -j$NIX_BUILD_CORES install mkdir -p "$out/bin" ln -s ../libexec/gargoyle/gargoyle "$out/bin" @@ -52,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with lib; { + meta = with stdenv.lib; { homepage = http://ccxvii.net/gargoyle/; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 2d2a31dd812c..668605a9ae10 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -rv data resources credits.txt license.txt "$out/share/mars/" cp -v mars "$out/bin/mars.bin" cat << EOF > "$out/bin/mars" - #! /bin/sh + #! ${stdenv.shell} cd "$out/share/mars/" exec "$out/bin/mars.bin" "\$@" EOF diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 050e0126fa72..97e0a5b81fd8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -v $src $out/lib/minecraft/server.jar cat > $out/bin/minecraft-server << EOF - #!/bin/sh + #!${stdenv.shell} exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui EOF diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 319cdb610ca6..2d636064205b 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { cp -r * "$out/opt/oilrush" mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" - #! /bin/sh + #!${stdenv.shell} LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 78fdb32b4360..e5243aef2d3e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -21,7 +21,7 @@ let }; playmidi = writeScriptBin "playmidi" '' - #!/bin/sh + #!${stdenv.shell} trap "${procps}/bin/pkill fluidsynth" EXIT ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $* ''; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index ce30be7be0b9..fd1a3e178d59 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for b in tremulous tremded do cat << EOF > $out/bin/$b - #!/bin/sh + #!${stdenv.shell} cd $out/opt/tremulous exec ./$b.$arch "\$@" EOF diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index fc6a45ace57b..85157d8df189 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cat <<EOF > $out/bin/trigger-rally - #!/bin/sh + #!${stdenv.shell} exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index ab6f1ca765ce..83fce64ca329 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done cat > $out/bin/Vessel << EOW - #!/bin/sh + #!${stdenv.shell} cd $out/libexec/strangeloop/vessel/ exec ./x86/vessel.x86 EOW diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ad86072dd1ca..97bfd9e730c7 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { #makeWrapper doesn't do cd. :( cat > $out/bin/WorldofGoo << EOF - #!/bin/sh + #!${stdenv.shell} cd $out/libexec/2dboy/WorldOfGoo exec ./WorldOfGoo.bin64 EOF diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 6fab49825340..3d5da2391157 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/zangband $out/bin/.zangband.real - echo '#! /bin/sh + echo '#! ${stdenv.shell} PATH="$PATH:${coreutils}/bin" ZANGBAND_PATH="$HOME/.zangband" |