Use the new configuration scheme for system's options.

svn path=/nixos/trunk/; revision=12549
2008-08-08 18:56:58 +00:00 · 2008-08-08 18:56:58 +00:00 · d63bfe3c31
commit d63bfe3c31
parent b8ff944cd2
2 changed files with 6 additions and 2 deletions
--- a/system/options.nix
+++ b/system/options.nix
@ -1,4 +1,8 @@
-{pkgs, mkOption}:
+pkgs: config:
+
+let
+  inherit (pkgs.lib) mkOption;
+in

 {

--- a/system/system.nix
+++ b/system/system.nix
@ -6,7 +6,7 @@
 rec {
  configComponents = [
    configuration
-    (import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;})
+    (import ./options.nix)
  ];

  noOption = name: values: