diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-28 17:16:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 17:16:48 +0200 |
| commit | 918f86f622b8004767629d0cacd7b8f07499e38f (patch) | |
| tree | 88542ec0c83b0c90b9e796b8e8eceae03b76f56b /pkgs | |
| parent | e8ed7bf5202d9117a06f8f85844cc3b3c260fc78 (diff) | |
| parent | 881e60eb98bac9ccb92f2c9d7ee05aff9afc0f37 (diff) | |
| download | nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar.gz nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar.bz2 nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar.lz nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar.xz nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.tar.zst nixlib-918f86f622b8004767629d0cacd7b8f07499e38f.zip | |
Merge pull request #166056 from IvarWithoutBones/fix/rtl8821ce-5_17
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/rtl8821ce/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 62743c226889..039d4b3fb7bb 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, kernel +, bc +}: stdenv.mkDerivation rec { pname = "rtl8821ce"; @@ -11,6 +17,12 @@ stdenv.mkDerivation rec { sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97"; }; + # Fixes the build on kernel >= 5.17. Can be removed once https://github.com/tomaspinho/rtl8821ce/pull/267 is merged + patches = [(fetchpatch { + url = "https://github.com/tomaspinho/rtl8821ce/commit/7b9e55df64b10fed785f22df9f36ed4a30b59d0e.patch"; + sha256 = "sha256-mpAWOG1aXsklGuDbrRB9Vd36mgeCdctKQaWuuoqEEp0="; + })]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; @@ -35,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.isAarch64 || kernel.kernelAtLeast "5.17"; + broken = stdenv.isAarch64; maintainers = with maintainers; [ hhm ivar ]; }; } |