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

Merge branch 'master' of github.com:NixOS/nixpkgs

Browse Source
This commit is contained in:
Cillian de Róiste 2013-03-03 19:40:43 +01:00
commit 133fc8a27c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/eduke32/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}:
stdenv.mkDerivation rec {
name = "eduke32-1944";
name = "eduke32-3542";
src = fetchurl {
url = http://dukeworld.duke4.net/eduke32/synthesis/20110724-1944/eduke32_src_20110724-1944.tar.bz2;
sha256 = "0y2y9agydfkdq4krp4lz22br3p23as6hrqhq7l9djw0pm2y76fqh";
url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc";
};
buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";

4
pkgs/top-level/all-packages.nix
View File

@ -8251,7 +8251,9 @@ let
dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { };
eduke32 = callPackage ../games/eduke32 { };
eduke32 = callPackage ../games/eduke32 {
stdenv = overrideGCC stdenv gcc47;
};
egoboo = callPackage ../games/egoboo { };