diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 15:48:39 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | 31203732b3104125e107a3141578399cab5d478f (patch) | |
| tree | 5af3aa2bb43acababf53db5fef2d9ea9f679b394 /nixos/lib/eval-config.nix | |
| parent | 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 (diff) | |
Update the release expressions and the channel generators
Diffstat (limited to 'nixos/lib/eval-config.nix')
| -rw-r--r-- | nixos/lib/eval-config.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 47e7d1a0eafa..89f81cf70bd9 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -7,7 +7,6 @@ , baseModules ? import ../modules/module-list.nix , extraArgs ? {} , modules -, nixpkgs ? <nixpkgs> }: let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in @@ -31,7 +30,7 @@ rec { extraArgs = extraArgs_ // { inherit pkgs modules baseModules; modulesPath = ../modules; - pkgs_i686 = import nixpkgs { system = "i686-linux"; }; + pkgs_i686 = import ../.. { system = "i686-linux"; }; utils = import ./utils.nix pkgs; }; @@ -48,7 +47,7 @@ rec { pkgs = if pkgs_ != null then pkgs_ - else import nixpkgs ( + else import ../.. ( let system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_; nixpkgsOptions = (import ./eval-config.nix { @@ -56,7 +55,7 @@ rec { # For efficiency, leave out most NixOS modules; they don't # define nixpkgs.config, so it's pointless to evaluate them. baseModules = [ ../modules/misc/nixpkgs.nix ]; - pkgs = import nixpkgs { system = system_; config = {}; }; + pkgs = import ../.. { system = system_; config = {}; }; }).optionDefinitions.nixpkgs; in { |