From dac886831c831d0eba60eb00a93e72af37b89f39 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 27 Feb 2024 06:12:43 +0800 Subject: [PATCH] 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 f10331cf2e8e ("buildLinux: passthru by .overrideAttrs instead of lib.extendDerivation") --- pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 046fb3fe6120..06a9f7322889 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -239,8 +239,8 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: { # Adds dependencies needed to edit the config: # nix-shell '' -A linux.configEnv --command 'make nconfig' - configEnv = kernel.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs or [] ++ (with buildPackages; [ + configEnv = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ (with buildPackages; [ pkg-config ncurses ]); });