aircrack-ng: add unreleased patch for openssl 1.1

NixOS · May 5, 2017 · dd2f2bc · dd2f2bc
1 parent 3d4ba40
commit dd2f2bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git 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, wirelesstools, libnl, pkgconfig }:
+{ stdenv, fetchurl, fetchpatch, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "aircrack-ng-1.2-rc4";
@@ -10,10 +10,20 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpcap openssl zlib libnl pkgconfig ];
 
-  patchPhase = ''
+  patches = [
+    (fetchpatch {
+      url = "https://trac.aircrack-ng.org/changeset/2882?format=diff&new=2882";
+      name = "openssl-1.1.patch";
+      sha256 = "11vk89jyd42l13i9y8l2p92p0cf4cdza40qpq75avvb7zqh3c2yi";
+      stripLen = 2;
+      addPrefixes = true;
+    })
+  ];
+
+  postPatch = ''
     sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
     sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
-    '';
+  '';
 
   meta = with stdenv.lib; {
     description = "Wireless encryption cracking tools";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -392,9 +392,7 @@ with pkgs;
 
   aide = callPackage ../tools/security/aide { };
 
-  aircrack-ng = callPackage ../tools/networking/aircrack-ng {
-    openssl = openssl_1_0_2;
-  };
+  aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
 
   airfield = callPackage ../tools/networking/airfield { };