4 files changed, 20 insertions, 14 deletions
diff --git a/pkgs/development/compilers/nasm/builder.sh b/pkgs/development/compilers/nasm/builder.sh
deleted file mode 100644
index 4109287448ddd..0000000000000
--- a/pkgs/development/compilers/nasm/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-mkdir -p $out/man/man1
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index a4444853a5fde..c2adc13dcc77d 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,10 +1,17 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "nasm-0.98.39";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "nasm-2.05.01";
+  
+  #builder = ./builder.sh;
+  
   src = fetchurl {
-    url = mirror://sourceforge/nasm/nasm-0.98.39.tar.bz2;
-    md5 = "2032ad44c7359f7a9a166a40a633e772";
+    url = "mirror://sourceforge/nasm/${name}.tar.bz2";
+    sha256 = "0p2rlshd68m2h7psyjz4440grxwryxppqzchx7cbmzahqr2yy1lj";
+  };
+
+  meta = {
+    homepage = http://www.nasm.us/;
+    description = "An 80x86 and x86-64 assembler designed for portability and modularity";
   };
 }
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index bdac219248342..725da1435fc82 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2f5dbfe3c463..bbed64dab9cb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7189,7 +7189,7 @@ let
   };
 
   eduke32 = import ../games/eduke32 {
-    inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig makeDesktopItem;
+    inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig nasm makeDesktopItem;
     inherit (gtkLibs) gtk;
   };