public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for require attributes inside children configurations.

Browse Source 
svn path=/nixos/trunk/; revision=18820
This commit is contained in:
Nicolas Pierron 2009-12-05 19:21:57 +00:00
parent 05c23802bb
commit 82a891dc46
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/system/activation/top-level.nix
View File

@ -41,16 +41,17 @@ let
# you can provide an easy way to boot the same configuration # you can provide an easy way to boot the same configuration
# as you use, but with another kernel # as you use, but with another kernel
# !!! fix this # !!! fix this
children = children = with pkgs.lib;
map (childConfig: map (childConfig:
(import ../../../default.nix { (import ../../../lib/eval-config.nix {
configuration = modules = [
pkgs.lib.recursiveUpdate childConfig { (recursiveUpdate childConfig {
boot.loader.grub.device = ""; boot.loader.grub.device = "";
# undefined the obsolete name of the previous option. # undefined the obsolete name of the previous option.
boot.grubDevice = pkgs.lib.mkNotdef; boot.grubDevice = pkgs.lib.mkNotdef;
}; })
}).system ] ++ attrByPath ["require"] [] childConfig;
}).config.system.build.toplevel
) config.nesting.children; ) config.nesting.children;