From a7fe548f63b85220b486157eaf55dcea45506590 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 7 Aug 2017 20:09:59 +0200 Subject: activation-checks: improve NIX_PATH warnings --- modules/system/activation-checks.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/system') 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 '') || true if ! test -e "$darwinConfig"; then echo "error: Changed but target does not exist, aborting activation" >&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 '')\" ];" >&2 echo >&2 @@ -48,7 +48,7 @@ let darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '') || true if ! test -e "$darwinPath"; then echo "error: Changed but target does not exist, aborting activation" >&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 '') || true if ! test -e "$nixpkgsPath"; then echo "error: Changed but target does not exist, aborting activation" >&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 -- cgit v1.2.3