diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2021-07-13 02:18:32 -0700 |
---|---|---|
committer | Bernardo Meurer <bernardo@meurer.org> | 2021-07-13 18:35:39 -0700 |
commit | e21183a95d81e0cd5b7d15d73373ac2e9195114f (patch) | |
tree | 09f5e967ae9c7b1d2375f4bf425ce4f8b8483dbd /pkgs/os-specific/linux/kernel | |
parent | ea167e8ccbcae6a3378e622255d9705d26f33058 (diff) | |
download | nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar.gz nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar.bz2 nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar.lz nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar.xz nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.tar.zst nixpkgs-e21183a95d81e0cd5b7d15d73373ac2e9195114f.zip |
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.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 29557b8d9e2..aa0f19858b8 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; |