* Move the config evaluation into a separate expression so that it can

  be reused, e.g. for building the CD/DVD.

svn path=/nixos/branches/modular-nixos/; revision=15744

1 files changed, 23 insertions, 0 deletions

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
new file mode 100644
index 00000000000..e1cf7ac3cf6
--- /dev/null
+++ b/lib/eval-config.nix
@@ -0,0 +1,23 @@
+# From an end-user configuration file (`configuration'), build a NixOS
+# configuration object (`config') from which we can retrieve option
+# values.
+
+{configuration, pkgs}:
+
+rec {
+  configComponents = [
+    configuration
+    (import ../system/options.nix)
+  ];
+
+  config =
+    pkgs.lib.fixOptionSets
+      pkgs.lib.mergeOptionSets
+      pkgs configComponents;
+
+  optionDeclarations =
+    pkgs.lib.fixOptionSetsFun
+      pkgs.lib.filterOptionSets
+      pkgs configComponents
+      config;
+}