From 290aeb344f27a40c50b534c43f18484b48b29102 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 17 Jul 2021 18:57:35 -0700 Subject: buildLinux: pass buildPackages to linuxManualConfig We should be using the _same_ buildPackages when we generate the configuration (which happens in buildLinux) as when we actually build the kernel (which happens in linuxManualConfig). This change enforces that when we callPackage `manual-config.nix` we pass on whatever `buildPackages` that `buildLinux` itself was called with. --- pkgs/os-specific/linux/kernel/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index aa0f19858b8..598dac90bab 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -179,7 +179,7 @@ let }; }; # end of configfile derivation - kernel = (callPackage ./manual-config.nix {}) { + kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) { inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; -- cgit 1.4.1