diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-08-07 20:09:59 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-08-07 20:09:59 +0200 |
| commit | a7fe548f63b85220b486157eaf55dcea45506590 (patch) | |
| tree | 4b732d1d1e10e058128f4f228abdc7c7983ec50c /modules/system | |
| parent | c24f744cd3a53d6297be61fa8329a6b660fbaa24 (diff) | |
activation-checks: improve NIX_PATH warnings
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/activation-checks.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/system/activation-checks.nix b/modules/system/activation-checks.nix index 279cc6e..91c74b5 100644 --- a/modules/system/activation-checks.nix +++ b/modules/system/activation-checks.nix @@ -38,7 +38,7 @@ let darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>') || true if ! test -e "$darwinConfig"; then echo "[1;31merror: Changed <darwin-config> but target does not exist, aborting activation[0m" >&2 - echo "Move you configuration.nix or set NIX_PATH:" >&2 + echo "Move you configuration.nix or set nix.nixPath:" >&2 echo >&2 echo " nix.nixPath = [ \"darwin-config=$(nix-instantiate --eval -E '<darwin-config>')\" ];" >&2 echo >&2 @@ -48,7 +48,7 @@ let darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin>') || true if ! test -e "$darwinPath"; then echo "[1;31merror: Changed <darwin> but target does not exist, aborting activation[0m" >&2 - echo "Add the darwin repo as a channel or set NIX_PATH:" >&2 + echo "Add the darwin repo as a channel or set nix.nixPath:" >&2 echo "$ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin" >&2 echo "$ sudo nix-channel --update" >&2 echo >&2 @@ -62,7 +62,7 @@ let nixpkgsPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<nixpkgs>') || true if ! test -e "$nixpkgsPath"; then echo "[1;31merror: Changed <nixpkgs> but target does not exist, aborting activation[0m" >&2 - echo "Add a nixpkgs channel or set NIX_PATH:" >&2 + echo "Add a nixpkgs channel or set nix.nixPath:" >&2 echo "$ sudo nix-channel --add http://nixos.org/channels/nixpkgs-unstable nixpkgs" >&2 echo "$ sudo nix-channel --update" >&2 echo >&2 |