From 82a891dc46ac335ddc989a753b8081c9677777ec Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 5 Dec 2009 19:21:57 +0000
Subject: [PATCH] Add support for require attributes inside children
 configurations.

svn path=/nixos/trunk/; revision=18820
---
 modules/system/activation/top-level.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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