From e21183a95d81e0cd5b7d15d73373ac2e9195114f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 13 Jul 2021 02:18:32 -0700 Subject: [PATCH] buildLinux: preserve structuredExtraConfig and extraMakeFlags in passthru This allows users to override custom kernel packages (e.g. linux_xanmod) that set their own structuredExtraConfig with ease. --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 29557b8d9e2e..aa0f19858b84 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -160,7 +160,6 @@ let enableParallelBuilding = true; passthru = rec { - module = import ../../../../nixos/modules/system/boot/kernel_config.nix; # used also in apache # { modules = [ { options = res.options; config = svc.config or svc; } ]; @@ -188,7 +187,7 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version;