diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-13 15:40:07 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-01-13 15:40:07 +0100 |
| commit | 789623213e227d1b363e511bc4d2b3f5878cb947 (patch) | |
| tree | 086d0dc4427475a62686ce5b45e95256509f584a /modules/system | |
| parent | 849cf9edc40044c91fb0cee9ecff46d316362fd0 (diff) | |
checks: impure darwin-config error message
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 9dac004..bddaa47 100644 --- a/modules/system/activation-checks.nix +++ b/modules/system/activation-checks.nix @@ -54,12 +54,12 @@ let ''; nixPath = '' - darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>') || true + darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>' || echo '$HOME/.nixpkgs/darwin-configuration.nix') || 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.nixPath:" >&2 + echo "Create $darwinConfig or set nix.nixPath:" >&2 echo >&2 - echo " nix.nixPath = [ \"darwin-config=$(nix-instantiate --eval -E '<darwin-config>')\" ];" >&2 + echo " nix.nixPath = [ \"darwin-config=$(nix-instantiate --eval -E '<darwin-config>' 2> /dev/null || echo '***')\" ];" >&2 echo >&2 exit 2 fi |