diff options
author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-04-08 14:01:16 +0000 |
---|---|---|
committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-04-08 14:01:16 +0000 |
commit | 3f1dd56e9ea933591793682c0b813aab76289b39 (patch) | |
tree | 97ceea0fc343bf3966fd96035a3962c75b042f12 /default.nix | |
parent | 840dc8c612a1477c845eac802c852966b6df250c (diff) | |
parent | 723b0dc74b33ff76619406f4289a743f64967f34 (diff) | |
download | nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar.gz nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar.bz2 nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar.lz nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar.xz nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.tar.zst nixlib-3f1dd56e9ea933591793682c0b813aab76289b39.zip |
* Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/default.nix b/default.nix index 86f437d36964..6dca88241a58 100644 --- a/default.nix +++ b/default.nix @@ -4,9 +4,9 @@ let let env = builtins.getEnv name; in if env == "" then default else env; configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix); - nixpkgsPath = fromEnv "NIXPKGS" /etc/nixos/nixpkgs; + nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs; - system = import system/system.nix { inherit configuration nixpkgsPath; }; + system = import system/system.nix { inherit configuration nixpkgs; }; in |