From f69ce50529c5108d4dababfd221652ace55264bd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 6 May 2014 10:31:48 -0400
Subject: Move most extra args out of eval-config.nix

---
 nixos/modules/misc/nixpkgs.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nixos/modules/misc/nixpkgs.nix')

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index cbb42c00003..2b648c1fa4e 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -60,6 +60,7 @@ in
 
     nixpkgs.system = mkOption {
       type = types.str;
+      default = builtins.currentSystem;
       description = ''
         Specifies the Nix platform type for which NixOS should be built.
         If unset, it defaults to the platform type of your host system.
@@ -69,4 +70,12 @@ in
     };
 
   };
+
+  config = {
+    __internal.args.pkgs = import ../../lib/nixpkgs.nix {
+      system = config.nixpkgs.system;
+
+      inherit (config.nixpkgs) config;
+    };
+  };
 }
-- 
cgit 1.4.1