From ffc6782e4eef59c64bb65bf4016fc314ca0e028d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Aug 2007 12:49:53 +0000
Subject: Updated nmap; X version also builds now

svn path=/nixpkgs/trunk/; revision=9043
---
 pkgs/tools/security/nmap/builder.sh  |  3 ---
 pkgs/tools/security/nmap/default.nix | 15 +++++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 pkgs/tools/security/nmap/builder.sh

(limited to 'pkgs/tools/security')

diff --git a/pkgs/tools/security/nmap/builder.sh b/pkgs/tools/security/nmap/builder.sh
deleted file mode 100644
index 896ef426398..00000000000
--- a/pkgs/tools/security/nmap/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
- 
-genericBuild
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 83aeaad445e..9688473de9b 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -1,12 +1,11 @@
-{stdenv, fetchurl}:
-  
+{stdenv, fetchurl, libpcap, libX11, gtk, pkgconfig}:
 stdenv.mkDerivation {
-  name = "nmap-3.55";
-  
-  builder = ./builder.sh;
+  name = "Nmap";
+
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/nmap-3.55.tar.bz2;
-    md5 = "88b5f010f43b0e2ee0c2cfb468796aa9";
+    url = http://insecure.org/nmap/dist/nmap-4.21ALPHA4.tar.bz2;
+    md5 = "eae883e12f3640f7c52d66e0844d0ab1";
   };
-  
+
+  buildInputs = [libpcap libX11 gtk pkgconfig];
 }
-- 
cgit 1.4.1