Merge staging-next into staging

2025-08-16 12:15:37 +00:00
parent 91646ee4fc 83e12d4080
commit fc627b6a75
1 changed files with 2 additions and 1 deletions
@@ -243,7 +243,8 @@ lib.makeOverridable (
        KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";

        patches =
-          map (p: p.patch) kernelPatches
+          # kernelPatches can contain config changes and no actual patch
+          lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
          # Required for deterministic builds along with some postPatch magic.
          ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
          ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch