From 03b5a4bfd68c844bf87b2af7cb2e40bf9fcd2e33 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 7 Aug 2025 23:15:32 +0800 Subject: [PATCH] modules.system.nixpkgs: fix native kernel patch --- modules/system/nixpkgs.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/system/nixpkgs.nix b/modules/system/nixpkgs.nix index a94603d2..1ece457a 100644 --- a/modules/system/nixpkgs.nix +++ b/modules/system/nixpkgs.nix @@ -17,17 +17,18 @@ inputs: { nixpkgs = inputs.localLib.buildNixpkgsConfig { inherit inputs; nixpkgs = nixpkgs // { nixRoot = null; nixos = true; }; }; - boot.kernelPatches = inputs.lib.mkIf (nixpkgs.march != null) - [{ - name = "native kernel"; - patch = null; - extraStructuredConfig = - let kernelConfig = { znver2 = "MZEN2"; znver3 = "MZEN3"; znver4 = "MZEN4"; }; - in - { - GENERIC_CPU = inputs.lib.kernel.no; - ${kernelConfig.${nixpkgs.march} or "M${inputs.lib.toUpper nixpkgs.march}"} = inputs.lib.kernel.yes; - }; - }]; + boot.kernelPatches = inputs.lib.mkIf + (nixpkgs.march != null && inputs.config.nixos.system.kernel.variant != "steamos") + [{ + name = "native kernel"; + patch = null; + extraStructuredConfig = + let kernelConfig = { znver2 = "MZEN2"; znver3 = "MZEN3"; znver4 = "MZEN4"; }; + in + { + GENERIC_CPU = inputs.lib.kernel.no; + ${kernelConfig.${nixpkgs.march} or "M${inputs.lib.toUpper nixpkgs.march}"} = inputs.lib.kernel.yes; + }; + }]; }; }