cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

buildLinux: preserve structuredExtraConfig and extraMakeFlags in passthru

Browse source 
This allows users to override custom kernel packages (e.g. linux_xanmod)
that set their own structuredExtraConfig with ease.
This commit is contained in:
Bernardo Meurer 2021-07-13 02:18:32 -07:00
parent ea167e8ccb
commit e21183a95d
No known key found for this signature in database
GPG key ID: F4C0D53B8D14C246
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -160,7 +160,6 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = rec { passthru = rec {
module = import ../../../../nixos/modules/system/boot/kernel_config.nix; module = import ../../../../nixos/modules/system/boot/kernel_config.nix;
# used also in apache # used also in apache
# { modules = [ { options = res.options; config = svc.config or svc; } ]; # { modules = [ { options = res.options; config = svc.config or svc; } ];
@ -188,7 +187,7 @@ let
passthru = { passthru = {
features = kernelFeatures; 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; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version; kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version; kernelAtLeast = lib.versionAtLeast version;