diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-02-02 21:57:18 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-02-02 21:57:18 +0000 |
commit | 95f38fc409a0aae08a18fb7b4554275166f28e07 (patch) | |
tree | 01d27f7a0fbebf5268305168c7becc041d15e56a /pkgs/tools/networking | |
parent | db6973610ca557ad6a3777cc472a9384d8cbbdb8 (diff) | |
download | nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar.gz nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar.bz2 nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar.lz nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar.xz nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.tar.zst nixpkgs-95f38fc409a0aae08a18fb7b4554275166f28e07.zip |
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
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/aircrack-ng/add-paths.patch | 17 | ||||
-rw-r--r-- | pkgs/tools/networking/aircrack-ng/default.nix | 9 |
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 6a79484e92c..00000000000 --- 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 6bedb6bc75b..a83506efa1c 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"; |