cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

linuxPackages.rtl88xxau-aircrack: fix build for linux 5.15

Browse source 
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>
This commit is contained in:
matthewcroughan 2021-11-12 22:22:13 +00:00
parent cf05198542
commit df6bfa5e3a
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
let let
rev = "3a64331a1c809bbbc21eca63b825970f213ec5ac"; rev = "307d694076b056588c652c2bdaa543a89eb255d9";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rtl88xxau-aircrack"; pname = "rtl88xxau-aircrack";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "aircrack-ng"; owner = "aircrack-ng";
repo = "rtl8812au"; repo = "rtl8812au";
inherit rev; inherit rev;
sha256 = "sha256-goaN80imfCeUwiHokJd10CFKskE3iL5BO/xOQk6PtHE="; sha256 = "sha256-iSJnKWc+LxGHUhb/wbFSMh7w6Oi9v4v5V+R+LI96X7w=";
}; };
buildInputs = kernel.moduleBuildDependencies; buildInputs = kernel.moduleBuildDependencies;
@ -20,14 +20,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; 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 = '' prePatch = ''
substituteInPlace ./Makefile \ substituteInPlace ./Makefile \
--replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
@ -48,6 +40,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = [ maintainers.jethro ]; maintainers = [ maintainers.jethro ];
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
broken = kernel.kernelAtLeast "5.15";
}; };
} }