diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-09-13 06:47:04 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-09-13 15:26:42 +0200 |
| commit | 53ff1ddce61dc60611882914b1e35f35ebb3407d (patch) | |
| tree | a680fd7c2366f16c1c38ef9cfc697f2624043d34 /pkgs | |
| parent | 633e7e8021e82dc831869071489412a8a2e50909 (diff) | |
pkgs/build-game: Add unzip to nativeBuildInputs
A lot of games come as a Zip archive, so let's add it to nativeBuildInputs by default so we no longer need to deal with that for every single game. This also removes that line from Invisigun Heroes, so the package now is pretty much minimal and very clean :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/build-support/build-game.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/itch/invisigun-heroes.nix | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/games/build-support/build-game.nix b/pkgs/games/build-support/build-game.nix index 5117b330..5951883d 100644 --- a/pkgs/games/build-support/build-game.nix +++ b/pkgs/games/build-support/build-game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, file, withPulseAudio ? true, libpulseaudio ? null }: +{ stdenv, lib, file, unzip, withPulseAudio ? true, libpulseaudio ? null }: assert withPulseAudio -> libpulseaudio != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ buildInputs = [ stdenv.cc.cc ] ++ buildInputs; nativeBuildInputs = [ - file ./setup-hooks/auto-patchelf.sh + unzip file ./setup-hooks/auto-patchelf.sh ] ++ nativeBuildInputs; preUnpack = preUnpack + '' diff --git a/pkgs/games/itch/invisigun-heroes.nix b/pkgs/games/itch/invisigun-heroes.nix index adbb2de3..72c1e7f4 100644 --- a/pkgs/games/itch/invisigun-heroes.nix +++ b/pkgs/games/itch/invisigun-heroes.nix @@ -1,4 +1,4 @@ -{ buildUnity, fetchItch, unzip }: +{ buildUnity, fetchItch }: buildUnity rec { name = "invisigun-heroes"; @@ -12,8 +12,4 @@ buildUnity rec { version = "v${version}"; sha256 = "07iskccdmygnx70naaa3fcac1ayrhmq82cypddsnihc3gkw7rwrd"; }; - - unpackCmd = '' - ${unzip}/bin/unzip -qq -d invisigun-heroes "$src" || : - ''; } |