From d63bfe3c3175819240ea4d41dd31b47985a55ad6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:56:58 +0000
Subject: [PATCH] Use the new configuration scheme for system's options.

svn path=/nixos/trunk/; revision=12549
---
 system/options.nix | 6 +++++-
 system/system.nix  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index a5e51a68ae6..3d1f61d11cf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,4 +1,8 @@
-{pkgs, mkOption}:
+pkgs: config:
+
+let
+  inherit (pkgs.lib) mkOption;
+in
 
 {
 
diff --git a/system/system.nix b/system/system.nix
index 3c4eb87e943..ec1d0407835 100644
--- 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: