From 120a82d7b9a2f00cb3889331ba6a7295a3c92df4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 May 2009 14:42:20 +0000
Subject: * NASM: updated to the latest version. * eduke: needs NASM on
 i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
---
 pkgs/development/compilers/nasm/builder.sh  |  6 ------
 pkgs/development/compilers/nasm/default.nix | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 pkgs/development/compilers/nasm/builder.sh

(limited to 'pkgs/development/compilers/nasm')

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";
   };
 }
-- 
cgit 1.4.1