diff options
Diffstat (limited to 'pkgs/games')
43 files changed, 75 insertions, 71 deletions
diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 73d08fda79f6d..3bb17b3e02f90 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -19,7 +19,7 @@ let installPhase = '' make INSTBASEDIR=$out install if [ -d $out/man ]; then - ensureDir $out/share + mkdir -p $out/share mv -v $out/man $out/share/ fi ''; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index e41e88fc1b066..2e252a5cd540a 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin install -v -m755 beret $out/bin - ensureDir $out/share + mkdir -p $out/share cp -av tahoma.ttf images music rooms sfx $out/share ''; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 8a79326bdead5..61e8571c47669 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 64d94196c64db..63139872cf9ca 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin/blackshadeselite cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index 07778363fd544..6e1af276c1fa3 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; postInstall = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv "data/"* "$out/share/${name}" mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat" diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index f12caaae53f73..9d363851148dd 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' set -x - ensureDir $out/bin - ensureDir $out/share/df_linux + mkdir -p $out/bin + mkdir -p $out/share/df_linux cp -r * $out/share/df_linux cp $permission $out/share/df_linux/nix_permission diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index b99f8b09b9de6..6eab8acce7517 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' # Install binaries - ensureDir $out/bin + mkdir -p $out/bin cp eduke32 mapster32 $out/bin # Make wrapper script @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/eduke32-wrapper # Install desktop item - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index a1b7262f3b97d..1f879393868f1 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} cp -v game/egoboo $out/share/${name} cd .. cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 4d71260143590..e784cc109f53e 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' - ensureDir $out/share/exult/music + mkdir -p $out/share/exult/music for i in $musicFiles; do unzip -o -d $out/share/exult/music $i done diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index a7d906ed9b8ed..fe90156d84cf2 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -38,7 +38,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall" "deployData"]; deployData = a.fullDepEntry '' - ensureDir "$out/share/FlightGear" + mkdir -p "$out/share/FlightGear" cd "$out/share/FlightGear" tar xvf ${datasrc} '' ["minInit" "defEnsureDir"]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 2752e565c58cc..ba6b65d602b4b 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/libexec + mkdir -p $out/bin $out/libexec cp sand $out/libexec echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index e5e5c94d4603a..ee792ef1e4d93 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp icbm3d $out/bin ''; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index d7fcb7a3f4e50..0d46e187d7b6e 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit games; installPhase = '' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} cp sdl-instead $out/bin cp -R games languages stead themes $out/share/${name} pushd $out/share/${name}/games diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index f9c62c83ddd35..50d261db8651a 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/share/keen4 +mkdir -p $out/share/keen4 unzip -j $dist -d $out/share/keen4 -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/keen4 <<EOF #! $SHELL -e if test -z "\$HOME"; then diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 991afca6180c1..34094b637fce3 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { installPhase = '' cd .. find -name '*.svn' -exec rm -rf {} \; - ensureDir "$out/share/mars/" - ensureDir "$out/bin/" + mkdir -p "$out/share/mars/" + mkdir -p "$out/bin/" cp -rv data resources credits.txt license.txt "$out/share/mars/" cp -v mars "$out/bin/mars.bin" cat << EOF > "$out/bin/mars" diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index f6e571404d6e5..36ccbf98274f9 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; postInstall = '' - ensureDir $out/share/naev + mkdir -p $out/share/naev cp -v $srcData $out/share/naev/ndata wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata ''; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 0d68b681ba553..d817cf6432385 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -36,7 +36,7 @@ rec { '') ["minInit" "doUnpack"]; postInstall = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/games/nethack $out/bin/nethack sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"' sed -i $out/bin/nethack -e '6amkdir -p "$NEWHACKDIR/save"' diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 7e2df42a2931d..1ebb4b69b6e11 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "export HOME=$TMPDIR"; installPhase = '' - ensureDir $out/bin $out + mkdir -p $out/bin $out cp -R data locale $out cp neverball $out/bin cp neverputt $out/bin diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index fd2a2f18f39d3..751941bdfc1e8 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -43,7 +43,7 @@ rec { '') ["doUnpack" "addInputs" "setParams"]; doInstall = a.fullDepEntry ('' - ensureDir $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR + mkdir -p $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR bash install.sh '') ["doBuild" "addInputs" "setParams" "defEnsureDir"]; diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 65e394f60bb24..9769e6f5d670a 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -22,7 +22,7 @@ with builderDefs; sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile make - ensureDir $out/bin + mkdir -p $out/bin cp -r .. $out/dump cat >$out/bin/space-orbit <<EOF #! /bin/sh diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 281bd8966f6fb..24baff5394a89 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { preConfigure = '' sed -i s,/usr/local,$out, Makefile - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 1fe925e31b6ad..bb67f422c9dfc 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp vegastrike $out/bin cp vegaserver $out/bin ''; diff --git a/pkgs/games/quake3/demo/builder.sh b/pkgs/games/quake3/demo/builder.sh index 640401a0ec85a..40b0a547243b2 100644 --- a/pkgs/games/quake3/demo/builder.sh +++ b/pkgs/games/quake3/demo/builder.sh @@ -5,5 +5,5 @@ chmod -R +w . tail -n +175 $update | tar xvfz - chmod -R +w . -ensureDir $out/baseq3 +mkdir -p $out/baseq3 cp demoq3/*.pk3 baseq3/*.pk3 $out/baseq3 diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index 3b82ebb83a8d9..6a05ab7f2bd7b 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -24,8 +24,11 @@ stdenv.mkDerivation { buildInputs = [x11 SDL mesa openal]; + # Fix building on GCC 4.6. + NIX_CFLAGS_COMPILE = "-Wno-error"; + preInstall = '' - ensureDir $out/baseq3 + mkdir -p $out/baseq3 installTargets=copyfiles installFlags="COPYDIR=$out" ''; diff --git a/pkgs/games/quake3/wrapper/builder.sh b/pkgs/games/quake3/wrapper/builder.sh index 57d6bc6a5ba24..6b5bd7450c570 100644 --- a/pkgs/games/quake3/wrapper/builder.sh +++ b/pkgs/games/quake3/wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/baseq3 +mkdir -p $out/baseq3 for i in $paks; do if test -d "$paks/baseq3"; then ln -s $paks/baseq3/* $out/baseq3/ diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 4fa8979830651..f92b5775ab723 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg - ensureDir $out/share/rigsofrods + mkdir -p $out/share/rigsofrods cp -r ../bin/* $out/share/rigsofrods cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin cd $out/share/rigsofrods mkdir packs diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index aca16d14e36c7..ff99b428cef7a 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -37,7 +37,7 @@ rec { ''; doUnpack = a.fullDepEntry '' - ensureDir $out/share/sauerbraten/build-dir + mkdir -p $out/share/sauerbraten/build-dir ln -s $out/share/sauerbraten/build-dir cd $out/share/sauerbraten/build-dir (cd ${src}; find . -type d) | tail -n +2 | xargs -L 1 mkdir @@ -50,7 +50,7 @@ rec { doCreateScripts = a.fullDepEntry '' cd .. - ensureDir $out/bin + mkdir -p $out/bin echo '#! /bin/sh' >> $out/bin/sauerbraten_server echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_server echo './bin_unix/native_server "$@"' >> $out/bin/sauerbraten_server diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 511aa850ff93e..c0f9d213762bd 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { mv sim simutrans/ - ensureDir $out/simutrans + mkdir -p $out/simutrans cp -r simutrans $out - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/simutrans/sim $out/bin/simutrans ''; diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 45b5988e88cf1..18a911d563bd8 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/share/teetertorture + mkdir -p $out/bin $out/share/teetertorture cp teetertorture $out/bin cp -R data/* $out/share/teetertorture ''; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 7824fbd9bdf05..c685f11c4c161 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { installPhase = '' # Copy the graphics, sounds, etc. - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv data other/icons "$out/share/${name}" # Copy the executables (client, server, etc.). - ensureDir "$out/bin" + mkdir -p "$out/bin" executables="" for file in * do @@ -46,7 +46,7 @@ EOF done # Copy the documentation. - ensureDir "$out/doc/${name}" + mkdir -p "$out/doc/${name}" cp -v *.txt "$out/doc/${name}" ''; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index caea5b4bb4fb2..5fc5e9be84e88 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -38,9 +38,9 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out/share/tbe" + mkdir -p "$out/share/tbe" cp -r . "$out/share/tbe/build-dir" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo '#! /bin/sh' >> "$out/bin/tbe" echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe" chmod a+x "$out/bin/tbe" diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 68d44364f5982..04438cf70addf 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation { ''; installPhase = '' python setup.py install --prefix=$out - ensureDir "$out"/share/tpm/ + mkdir -p "$out"/share/tpm/ cp -r . "$out"/share/tpm/build-dir - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! /bin/sh" >> "$out/bin/tpm" echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index bdac6cddf2d2b..22d8c944fa8bf 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,8 +1,11 @@ -{stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile, - debug ? false } : +{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile +, debug ? false }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "trackballs-1.1.4"; + src = fetchurl { url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; @@ -10,16 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; - CFLAGS = if debug then "-g -O0" else null; + CFLAGS = optionalString debug "-g -O0"; CXXFLAGS = CFLAGS; - NIX_STRIP_DEBUG = if debug then "0" else "1"; - dontStrip = if debug then true else false; - postUnpack = if debug then - "ensureDir $out/src; cp -R * $out/src ; cd $out/src" - else null; + dontStrip = debug; + postUnpack = optionalString debug + "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; - NIX_CFLAGS_COMPILE="-iquote ${SDL}/include/SDL"; - configureFlags = if debug then "--enable-debug" else null; + NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; + configureFlags = optionalString debug "--enable-debug"; patchPhase = '' sed -i -e 's/images icons music/images music/' share/Makefile.in diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index a4a887e2ed3d7..bef4b63b0cc8f 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' arch=$(uname -m | sed -e s/i.86/x86/) - ensureDir $out/opt/tremulous + mkdir -p $out/opt/tremulous cp -v Release_1.011/build/release-linux-$arch/tremulous.$arch $out/opt/tremulous/ cp -v mg_tremded_source/build/release-linux-$arch/tremded.$arch $out/opt/tremulous/ cp -rv base $out/opt/tremulous - ensureDir $out/bin + mkdir -p $out/bin for b in tremulous tremded do cat << EOF > $out/bin/$b diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index f958897cd401a..2a25c290b2d83 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' jam install - ensureDir $out/share + mkdir -p $out/share pushd $out/share tar xf $srcData ''; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index dc870c79aba10..74448cdad76f7 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' destDir="$out/opt/urbanterror" - ensureDir "$destDir" - ensureDir "$out/bin" + mkdir -p "$destDir" + mkdir -p "$out/bin" cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \ "$destDir/ioUrbanTerror" cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \ diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh index 5dbb451272adc..53ef90a615b06 100644 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ b/pkgs/games/ut2004demo/make-wrapper.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/ut2004demo <<EOF #! $SHELL -e diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 5f9031ceeaa81..6f0fb48f0a5f9 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { preConfigure = '' sed -i s,/usr/local,$out, Makefile - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index c70b6f6f22e66..c584319bdc9b9 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd warsow_${version}_sdk unzip $src1 unzip $src2 - ensureDir source/release/ + mkdir -p source/release/ mv warsow_${mversion}_unified/basewsw source/release/ cd source ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { for f in warsow wsw_server wswtv_server; do substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest done - ensureDir $dest - ensureDir $out/bin + mkdir -p $dest + mkdir -p $out/bin cp -v {warsow,wsw_server,wswtv_server}.* $dest cp -rv basewsw libs $dest cp -v warsow wsw_server wswtv_server $out/bin diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 8ac05d9ef72c1..3553649dccb81 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" cp darkplaces-sdl "$out/bin/xonotic-sdl" cd ../.. - ensureDir "$out/share/xonotic" + mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" ''; dontPatchELF = true; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index b3b3954da8cfa..b8917b4d41c9b 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -38,7 +38,7 @@ rec { preBuild = a.fullDepEntry ('' sed -e "s@/usr/local/@$out/@" -i Makefile sed -e "s@ /bin/@ @" -i Makefile - ensureDir $out/bin $out/share $out/man/man1 $out/lib + mkdir -p $out/bin $out/share $out/man/man1 $out/lib '') ["minInit" "doConfigure" "defEnsureDir"]; name = "xsokoban-" + version; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index dd654edcfe199..b94633d8d3a6f 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -21,9 +21,9 @@ rec { sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in sed -e '/FIXED_PATHS/d' -i src/z-config.h ./bootstrap - ensureDir $out/share/games/zangband - ensureDir $out/share/man - ensureDir $out/bin + mkdir -p $out/share/games/zangband + mkdir -p $out/share/man + mkdir -p $out/bin '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; postInstall = a.fullDepEntry ('' diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 731a5e40fd808..d9fcb47bcc36e 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-L${mysql}/lib/mysql"; installPhase = '' - ensureDir $out/bin $out/share/zod + mkdir -p $out/bin $out/share/zod pushd $out/share/zod unrar x $srcAssets popd |