Merge pull request #28203 from danielfullmer/rtl8812-fix

rtl8812au driver fixes

authored by Jörg Thalheim and committed by GitHub 5839cefb bd657a72

+21 -3
+21 -3
pkgs/os-specific/linux/rtl8812au/default.nix
··· 1 - { stdenv, fetchFromGitHub, kernel }: 2 3 stdenv.mkDerivation rec { 4 name = "rtl8812au-${kernel.version}-${version}"; ··· 11 sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; 12 }; 13 14 hardeningDisable = [ "pic" ]; 15 16 NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; 17 18 - patchPhase = '' 19 substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" 20 substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" 21 - substituteInPlace ./Makefile --replace /sbin/depmod # 22 substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" 23 ''; 24
··· 1 + { stdenv, fetchFromGitHub, fetchpatch, kernel }: 2 3 stdenv.mkDerivation rec { 4 name = "rtl8812au-${kernel.version}-${version}"; ··· 11 sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; 12 }; 13 14 + patches = [ 15 + (fetchpatch { # From PR # 42 16 + name = "rtl8812au-4.11.x-fix.patch"; 17 + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch; 18 + sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks"; 19 + }) 20 + (fetchpatch { # From PR #46 21 + name = "rtl8812au-4.11.9-fix.patch"; 22 + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch; 23 + sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz"; 24 + }) 25 + (fetchpatch { # From PR #43 26 + name = "rtl8812au-4.12-fix.patch"; 27 + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch; 28 + sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d"; 29 + }) 30 + ]; 31 + 32 hardeningDisable = [ "pic" ]; 33 34 NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; 35 36 + prePatch = '' 37 substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" 38 substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" 39 + substituteInPlace ./Makefile --replace /sbin/depmod \# 40 substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" 41 ''; 42