diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 18:37:12 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 18:37:12 +0000 |
commit | 90023351019defa926292287bcf4c42e497a1a51 (patch) | |
tree | 2dbac47737096c3c5542a8393fb438ac9936c55f /lib | |
parent | bc4e159d0e78cef78a5b12cb9ea21a3df3593272 (diff) | |
download | nixlib-90023351019defa926292287bcf4c42e497a1a51.tar nixlib-90023351019defa926292287bcf4c42e497a1a51.tar.gz nixlib-90023351019defa926292287bcf4c42e497a1a51.tar.bz2 nixlib-90023351019defa926292287bcf4c42e497a1a51.tar.lz nixlib-90023351019defa926292287bcf4c42e497a1a51.tar.xz nixlib-90023351019defa926292287bcf4c42e497a1a51.tar.zst nixlib-90023351019defa926292287bcf4c42e497a1a51.zip |
Making nixos handle the nixpkgs 'platform' parameter.
svn path=/nixos/trunk/; revision=20274
Diffstat (limited to 'lib')
-rw-r--r-- | lib/eval-config.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/eval-config.nix b/lib/eval-config.nix index 28db11e45c56..77c20caf6045 100644 --- a/lib/eval-config.nix +++ b/lib/eval-config.nix @@ -47,17 +47,20 @@ rec { pkgs = if pkgs_ != null then pkgs_ - else import nixpkgs { - inherit system; - config = - (import ./eval-config.nix { + else import nixpkgs ( + let + nixpkgsOptions = (import ./eval-config.nix { inherit system nixpkgs services extraArgs modules; # 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 { inherit system; config = {}; }; - }).optionDefinitions.nixpkgs.config; - }; + }).optionDefinitions.nixpkgs; + in + { + inherit system; + inherit (nixpkgsOptions) config platform; + }); # Optionally check wether all config values have corresponding # option declarations. |