Complete nixpkgsPath->nixpkgs rename

svn path=/nixos/trunk/; revision=14732
This commit is contained in:
Michael Raskin 2009-03-27 09:29:11 +00:00
parent 61d24401ee
commit bcbfd8d386

View file

@ -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