dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

fix kconfig override 

the default kconfig should be in a config stanza, not in the
default attr of the options stanza, otherwise it gets overridden
completely instead of merged
This commit is contained in:
Daniel Barlow 2022-09-25 13:17:21 +01:00
parent c1835d97ee
commit 0c25983c0b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -5,7 +5,8 @@ let
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; }); nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; });
config = (import ./merge-modules.nix) [ config = (import ./merge-modules.nix) [
(import ./modules/base.nix { inherit device; }) ./modules/base.nix
({ lib, ... } : { config = { inherit (device) kernel; }; })
<liminix-config> <liminix-config>
] nixpkgs.pkgs; ] nixpkgs.pkgs;
finalConfig = config // { finalConfig = config // {
@ -15,7 +16,7 @@ let
; ;
}; };
squashfs = (import ./make-image.nix) nixpkgs finalConfig; squashfs = (import ./make-image.nix) nixpkgs finalConfig;
kernel = (import ./make-kernel.nix) nixpkgs finalConfig; kernel = (import ./make-kernel.nix) nixpkgs finalConfig.kernel.config;
in { in {
outputs = { outputs = {
inherit squashfs kernel; inherit squashfs kernel;

2
make-kernel.nix
View File

@ -24,6 +24,6 @@ in
{ {
vmlinux = callPackage ./make-vmlinux.nix { vmlinux = callPackage ./make-vmlinux.nix {
inherit tree; inherit tree;
inherit (config.kernel) config;# checkedConfig; inherit config;
}; };
} }

2
modules/base.nix
View File

@ -1,4 +1,3 @@
{ device } :
{ lib, ...}: { lib, ...}:
let inherit (lib) mkEnableOption mkOption types; let inherit (lib) mkEnableOption mkOption types;
in { in {
@ -11,7 +10,6 @@ in {
}; };
kernel = mkOption { kernel = mkOption {
type = types.anything; type = types.anything;
default = { inherit (device.kernel) config checkedConfig; };
}; };
}; };
} }