Rewrite the optionDeclarations to collect all options definitions.

svn path=/nixos/trunk/; revision=12521
2008-08-06 18:43:53 +00:00 · 2008-08-06 18:43:53 +00:00 · 53bdeb43e3
commit 53bdeb43e3
parent 92560a1dc0
1 changed files with 5 additions and 2 deletions
--- 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;};