summary refs log tree commit diff
diff options
context:
space:
mode:
authormatthewcroughan <matt@croughan.sh>2021-11-12 22:22:13 +0000
committermatthewcroughan <matt@croughan.sh>2021-11-12 22:52:36 +0000
commitdf6bfa5e3a06d0a4d84a7d2b95bea023552e4599 (patch)
tree9d5cc964fc1e839395f2fd80582188492775b81d
parentcf0519854227bac9f429c8b5129a75168cc4de26 (diff)
downloadnixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar.gz
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar.bz2
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar.lz
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar.xz
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.tar.zst
nixpkgs-df6bfa5e3a06d0a4d84a7d2b95bea023552e4599.zip
linuxPackages.rtl88xxau-aircrack: fix build for linux 5.15
This removes the unnecessary patches and bumps the version to the rev of
tag v5.6.4.2

ZHF: https://github.com/NixOS/nixpkgs/issues/144627

Co-authored-by: nixinator <33lockdown33@protonmail.com>
-rw-r--r--pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
index 5254c8aea2c..cc8f4ed611f 100644
--- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
+++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
 
 let
-  rev = "3a64331a1c809bbbc21eca63b825970f213ec5ac";
+  rev = "307d694076b056588c652c2bdaa543a89eb255d9";
 in
 stdenv.mkDerivation rec {
   pname = "rtl88xxau-aircrack";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "aircrack-ng";
     repo = "rtl8812au";
     inherit rev;
-    sha256 = "sha256-goaN80imfCeUwiHokJd10CFKskE3iL5BO/xOQk6PtHE=";
+    sha256 = "sha256-iSJnKWc+LxGHUhb/wbFSMh7w6Oi9v4v5V+R+LI96X7w=";
   };
 
   buildInputs = kernel.moduleBuildDependencies;
@@ -20,14 +20,6 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
 
-  # Fix build for 5.12 kernels
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/aircrack-ng/rtl8812au/commit/9b4c60a89c2a55f36454b950a86246b6b86a9681.patch";
-      sha256 = "sha256-HPhTLstqAePF3H6WeM9Fu4/8UjNL+9xl4L8xq3NOWuM=";
-    })
-  ];
-
   prePatch = ''
     substituteInPlace ./Makefile \
       --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
@@ -48,6 +40,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = [ maintainers.jethro ];
     platforms = [ "x86_64-linux" "i686-linux" ];
-    broken = kernel.kernelAtLeast "5.15";
   };
 }