From 53bdeb43e3d1bf1518974739cfd662d65f108913 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 6 Aug 2008 18:43:53 +0000
Subject: [PATCH] Rewrite the optionDeclarations to collect all options
 definitions.

svn path=/nixos/trunk/; revision=12521
---
 system/system.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index a8e84caebfa9..596466373396 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -7,7 +7,7 @@
 rec {
   configComponents = [
     configuration
-    optionDeclarations
+    (import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;})
   ];
 
   noOption = name: values:
@@ -21,7 +21,10 @@ rec {
       pkgs configComponents;
 
   optionDeclarations =
-    import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
+    pkgs.lib.finalOptionSetsFun
+      pkgs.lib.filterOptionSets
+      pkgs configComponents
+      config;
 
   pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};