Skip to content

Commit d743ab3

Browse files
committed
raspberry-pi: replace lib.overrideDerivation with .overrideAttrs
lib.overrideDerivation is deprecated and strips passthru attributes (.configfile, .moduleBuildDependencies, etc.) from the kernel derivation, which breaks downstream users expecting a standard buildLinux output. .overrideAttrs preserves passthru and matches every other custom kernel in this repo.
1 parent 2096f3f commit d743ab3

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

raspberry-pi/common/kernel.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ let
1414
tag = "stable_20250916";
1515
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
1616
in
17-
lib.overrideDerivation
18-
(buildLinux (
19-
args
20-
// {
17+
(buildLinux (
18+
args
19+
// {
2120
version = "${modDirVersion}-${tag}";
2221
inherit modDirVersion;
2322
pname = "linux-rpi";
@@ -64,8 +63,7 @@ lib.overrideDerivation
6463
ignoreConfigErrors = true;
6564
}
6665
// (args.argsOverride or { })
67-
))
68-
(_oldAttrs: {
66+
)).overrideAttrs {
6967
postConfigure = ''
7068
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
7169
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
@@ -110,4 +108,4 @@ lib.overrideDerivation
110108
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
111109
copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
112110
'';
113-
})
111+
}

0 commit comments

Comments
 (0)