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

pkgs/tools/networking/aircrack-ng/add-paths.patch

@@ -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 *);

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 ];
+  patchPhase = ''
-
+    sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
-  postPatch = "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";

pkgs/top-level/all-packages.nix

@@ -482,13 +482,9 @@ let
     inherit fetchurl stdenv fuse;
   };
 
-  # It builds, but it has paths pointing to the default profile,
+  aircrackng = import ../tools/networking/aircrack-ng {
-  # hardcoded to /nix/var/nix/profiles/default/bin. We need to
+    inherit fetchurl stdenv libpcap openssl zlib wirelesstools;
-  # know its dependencies for the executable paths and stop
+  };
-  # using the profiles, pointing directly to the store paths needed.
-  #aircrackng = import ../tools/networking/aircrack-ng {
-  #  inherit fetchurl stdenv libpcap openssl zlib;
-  #};
 
   amule = import ../tools/networking/p2p/amule {
     inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper;