diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/crafty/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/twbt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/exult/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/gogui/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/keen4/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/nexuiz/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/rigsofrods/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/simutrans/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/steam/fonts.nix | 2 | ||||
-rw-r--r-- | pkgs/games/terraria-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/tremulous/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/urbanterror/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/worldofgoo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/xonotic/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/zod/default.nix | 4 |
15 files changed, 23 insertions, 22 deletions
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 1328488dde3ad..b5b53aa3c4131 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir "craftysrc" diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 48826ca916097..bee2c28e53088 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec { outputs = [ "lib" "art" "out" ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $lib/hack/{plugins,lua} $art/data/art diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e16e62f82fb44..40d7300e9c5a1 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tools" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ SDL2 libogg libvorbis zlib ]; enableParallelBuilding = true; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index fa901c14f8195..c7b37b31c3557 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -5,8 +5,7 @@ let in stdenv.mkDerivation { pname = "gogui"; inherit version; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index c91cc486118f3..59bb30d627f7f 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; inherit dosbox; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 60085d5c85b30..84d8a6200015f 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -21,9 +21,8 @@ in stdenv.mkDerivation { sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - # required for both - unzip # glx libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 01dd1f0c04f3e..72c8a49939d38 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost - libuuid openal ogre ois curl gtk2 mygui unzip angelscript + libuuid openal ogre ois curl gtk2 mygui angelscript ogrepaged mysocketw libxcb ]; meta = with lib; { diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 942c93ec043fa..fc2654fd8e9b4 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -115,8 +115,8 @@ let sourceRoot = "."; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer ]; configurePhase = let # Configuration as per the readme.txt and config.template diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix index 44dde01a8a83c..9cf68f2c29b05 100644 --- a/pkgs/games/steam/fonts.nix +++ b/pkgs/games/steam/fonts.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "."; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 94fb9d063b320..de430d296222d 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh"; }; - buildInputs = [ file unzip ]; - nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ file ]; + nativeBuildInputs = [ autoPatchelfHook unzip ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index a4bf47b5e3624..e07697f7c0e1a 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz"; sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql"; }; - buildInputs = [ unzip libGLU libGL libX11 SDL openal ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libGLU libGL libX11 SDL openal ]; unpackPhase = '' unzip $src1 cd tremulous diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 10553d483a501..dfbad29fa9e01 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 27a270fcf8f3a..a9938cfcbc042 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; sourceRoot = pname; phases = [ "unpackPhase installPhase" ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 54ec25c8cf799..fb6cb93f7f242 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -62,7 +62,8 @@ let sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; }; - buildInputs = [ unzip libjpeg zlib libvorbis curl ] + nativeBuildInputs = [ unzip ]; + buildInputs = [ libjpeg zlib libvorbis curl ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 6c48caf8756aa..c358e599924ac 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; + nativeBuildInputs = [ makeWrapper unrar unzip ]; + buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; |