pyrox.dev
Merge staging-next into staging
authored by
nixpkgs-ci[bot]
and committed by
GitHub
fc627b6a
91646ee4
+2
-1
pkgs/os-specific/linux/kernel/manual-config.nix
+2
-1
pkgs/os-specific/linux/kernel/manual-config.nix
···
243
243
KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
244
244
245
245
patches =
246
-
map (p: p.patch) kernelPatches
246
+
# kernelPatches can contain config changes and no actual patch
247
+
lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
247
248
# Required for deterministic builds along with some postPatch magic.
248
249
++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
249
250
++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch