public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'x-updates' into staging

Browse Source 
...in preparation for a merge to master
This commit is contained in:
Vladimír Čunát
2014-07-22 22:28:39 +02:00
parent 402688b752 adc2edd5cf
commit b9045a7d96
63 changed files with 425 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/exult/default.nix
View File

@@ -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";

2
pkgs/games/neverball/default.nix
View File

@@ -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;