diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
| commit | b9045a7d9651a2f8a0bbc8c86cd72f970e951068 (patch) | |
| tree | 75ee378fba0bae606e350cb145c2589636a2c660 /pkgs/games | |
| parent | 402688b752a4b2c5548a1d07aed4fbbde2b55e87 (diff) | |
| parent | adc2edd5cf524239690b5cf49779a11fd2eb061b (diff) | |
| download | nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.gz nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.bz2 nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.lz nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.xz nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.zst nixpkgs-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.zip | |
Merge branch 'x-updates' into staging
...in preparation for a merge to master
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/exult/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/neverball/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e784cc109f5..b52109a8d9e 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ./64bits.patch ]; - buildInputs = [SDL SDL_mixer zlib libpng unzip]; + buildInputs = [libpng SDL SDL_mixer zlib unzip]; NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL"; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 1ebb4b69b6e..2bec14a11c1 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga"; }; - buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs]; + buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs]; dontPatchElf = true; |