* NASM: updated to the latest version.

* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
This commit is contained in:
Eelco Dolstra
2009-05-14 14:42:20 +00:00
parent 1cfc364e98
commit 120a82d7b9
4 changed files with 20 additions and 14 deletions
+7 -2
View File
@@ -1,13 +1,18 @@
{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, makeDesktopItem}:
{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
stdenv.mkDerivation rec {
name = "eduke32";
src = fetchurl {
url = http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090131.zip;
sha256 = "e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d";
};
buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ];
buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
NIX_LDFLAGS = "-lgcc_s";
desktopItem = makeDesktopItem {
name = "eduke32";
exec = "eduke32-wrapper";