From fb4ff6250eaff6e82eb13ad7fe705a45c24390dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 22 Feb 2023 14:02:07 +0100 Subject: [PATCH] t14s,p14s: remove rtw89-firmware if linux-firmware new enough --- lenovo/thinkpad/p14s/amd/gen2/default.nix | 2 +- lenovo/thinkpad/t14s/amd/gen1/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lenovo/thinkpad/p14s/amd/gen2/default.nix b/lenovo/thinkpad/p14s/amd/gen2/default.nix index fb4e3e4..4fefc37 100644 --- a/lenovo/thinkpad/p14s/amd/gen2/default.nix +++ b/lenovo/thinkpad/p14s/amd/gen2/default.nix @@ -12,7 +12,7 @@ # Wifi support - hardware.firmware = [ pkgs.rtw89-firmware ]; + hardware.firmware = lib.mkIf (lib.versionOlder pkgs.linux-firmware.version "20230210") [ pkgs.rtw89-firmware ]; # For mainline support of rtw89 wireless networking boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest; diff --git a/lenovo/thinkpad/t14s/amd/gen1/default.nix b/lenovo/thinkpad/t14s/amd/gen1/default.nix index 9dd565d..f6bb75a 100644 --- a/lenovo/thinkpad/t14s/amd/gen1/default.nix +++ b/lenovo/thinkpad/t14s/amd/gen1/default.nix @@ -6,7 +6,7 @@ ../. ]; # Wifi support - hardware.firmware = [ pkgs.rtw89-firmware ]; + hardware.firmware = lib.mkIf (lib.versionOlder pkgs.linux-firmware.version "20230210") [ pkgs.rtw89-firmware ]; # For mainline support of rtw89 wireless networking boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest;