diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-20 10:18:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-20 10:18:54 +0000 |
| commit | f99fe41f65911e7123cb9e32ac62bb7acb77b08d (patch) | |
| tree | 582672423e5a813e32f34d2c0e9c3df7de939abd /default.nix | |
| parent | eb91b2780914448c9ccf3a281da6c1bf3a6189d0 (diff) | |
svn path=/nixos/branches/modular-nixos/; revision=15670
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/default.nix b/default.nix index 6dca88241a5..9dd73430b66 100644 --- a/default.nix +++ b/default.nix @@ -3,8 +3,10 @@ let fromEnv = name: default: let env = builtins.getEnv name; in if env == "" then default else env; + configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix); - nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs; + + nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs; system = import system/system.nix { inherit configuration nixpkgs; }; |