summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-01-30 04:49:04 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-01-31 11:58:23 +0000
commit0fe169afee064807dd8d2c5bb4924a1a385cd908 (patch)
treeed42936872adbd60cf8f019322ed8ea7842d434b
parentMerge pull request #157385 from NixOS/backport-157375-to-release-21.11 (diff)
downloadnixpkgs-origin/backport-157351-to-release-21.11.tar.gz
enableRedistributableFirmware: only add rtw89-firmware when kernel older 5.16origin/backport-157351-to-release-21.11
(cherry picked from commit b02446784dbeb5446bf9949a56864936c30defff)
-rw-r--r--nixos/modules/hardware/all-firmware.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index ce87f9e8be8a..f00e0cd6029c 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -58,7 +58,6 @@ in {
rtl8723bs-firmware
rtl8761b-firmware
rtw88-firmware
- rtw89-firmware
zd1211fw
alsa-firmware
sof-firmware
@@ -66,6 +65,8 @@ in {
] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware
+ ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [
+ rtw89-firmware
];
hardware.wirelessRegulatoryDatabase = true;
})