Skip to content

Commit dac8868

Browse files
ShamrockLeealyssais
authored andcommitted
buildLinux: kernel.configEnv: comply with overrideAttrs
Override `finalAttrs.finalPackage` instead of `kernel` from the let-in block to make configEnv behave in accordance with overrideAttrs of the result package. Continuation of commit f10331c ("buildLinux: passthru by <pkg>.overrideAttrs instead of lib.extendDerivation")
1 parent 580ce6a commit dac8868

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pkgs/os-specific/linux/kernel/generic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: {
239239

240240
# Adds dependencies needed to edit the config:
241241
# nix-shell '<nixpkgs>' -A linux.configEnv --command 'make nconfig'
242-
configEnv = kernel.overrideAttrs (old: {
243-
nativeBuildInputs = old.nativeBuildInputs or [] ++ (with buildPackages; [
242+
configEnv = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
243+
nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ (with buildPackages; [
244244
pkg-config ncurses
245245
]);
246246
});

0 commit comments

Comments
 (0)