public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move most extra args out of eval-config.nix

Browse Source
This commit is contained in:
Shea Levy
2015-03-12 23:42:57 +01:00
committed by Nicolas B. Pierron
parent 0a0a29fd0b
commit f69ce50529
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/lib/eval-config.nix
+3 -17
View File
@@ -35,6 +35,7 @@ let
key = _file;
config = {
nixpkgs.system = lib.mkDefault system_;
__internal.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};
@@ -56,23 +57,8 @@ in rec {
# the 64-bit package anyway. However, it would be cleaner to respect
# nixpkgs.config here.
extraArgs = extraArgs_ // {
inherit pkgs modules baseModules;
modulesPath = ../modules;
pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; };
utils = import ./utils.nix pkgs;
inherit modules baseModules;
};
pkgs =
if pkgs_ != null
then pkgs_
else import ./nixpkgs.nix (
let
system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
nixpkgsOptions = config.nixpkgs;
in
{
inherit system;
inherit (nixpkgsOptions) config;
});
inherit (config.__internal.args) pkgs;
}