diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-14 14:42:20 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-14 14:42:20 +0000 |
commit | 120a82d7b9a2f00cb3889331ba6a7295a3c92df4 (patch) | |
tree | f28853e67ed82bea32d0fc1454f736018d863675 /pkgs/games | |
parent | 1cfc364e98b93bd3580c12ef9a3ef57727f2c11b (diff) |
* NASM: updated to the latest version.
* eduke: needs NASM on i686-linux.
svn path=/nixpkgs/trunk/; revision=15604
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/eduke32/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index bdac21924834..725da1435fc8 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -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"; |