summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2021-07-17 18:57:35 -0700
committerBernardo Meurer <bernardo@meurer.org>2021-07-17 18:57:35 -0700
commit290aeb344f27a40c50b534c43f18484b48b29102 (patch)
tree0b780db4455fb8d365ac284e5cc03c7ffc387c07 /pkgs/os-specific
parent688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff)
downloadnixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar.gz
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar.bz2
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar.lz
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar.xz
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.tar.zst
nixpkgs-290aeb344f27a40c50b534c43f18484b48b29102.zip
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.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix2
1 files changed, 1 insertions, 1 deletions
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"; };