Fixing the aircrack-ng build, so it doesn't depend on any profile

and points, as usual, only to the store for its dependencies.

svn path=/nixpkgs/trunk/; revision=13965

2 files changed, 5 insertions, 21 deletions

diff --git a/pkgs/tools/networking/aircrack-ng/add-paths.patch b/pkgs/tools/networking/aircrack-ng/add-paths.patch
deleted file mode 100644
index 6a79484e92ce..000000000000
--- a/pkgs/tools/networking/aircrack-ng/add-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/osdep/linux.c b/src/osdep/linux.c
-index 9f3b1ef..ba7e584 100644
---- a/src/osdep/linux.c
-+++ b/src/osdep/linux.c
-@@ -235,7 +235,11 @@ static char * wiToolsPath(const char * tool)
-                 "/bin",
-                 "/usr/bin",
-                 "/usr/local/bin",
--                "/tmp"
-+                "/tmp",
-+                "/var/run/current-system/sw/bin",
-+                "/var/run/current-system/sw/sbin",
-+                "/root/.nix-profile/bin",
-+                "/root/.nix-profile/sbin"
-         };
- 
-         nbelems = sizeof(paths) / sizeof(char *);
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 6bedb6bc75b9..a83506efa1c1 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libpcap, openssl, zlib}:
+{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}:
 
 stdenv.mkDerivation {
   name = "aircrack-ng-1.0-rc2";
@@ -10,9 +10,10 @@ stdenv.mkDerivation {
 
   buildInputs = [libpcap openssl zlib];
 
-  patches = [ ./add-paths.patch ];
-
-  postPatch = "sed -e 's@^prefix.*@prefix = '$out@ -i common.mak";
+  patchPhase = ''
+    sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
+    sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
+    '';
 
   meta = {
     description = "Wireless encryption crackign tools";