From 345d9ffa0ed93d4c7e9cd8ab01bb5094ef630baa Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 23 Jul 2017 17:28:58 +0200
Subject: activation-checks: add NIX_PATH check for darwin-config

---
 modules/system/activation-checks.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'modules/system')

diff --git a/modules/system/activation-checks.nix b/modules/system/activation-checks.nix
index b04f577..ccff46c 100644
--- a/modules/system/activation-checks.nix
+++ b/modules/system/activation-checks.nix
@@ -19,6 +19,16 @@ let
   '';
 
   nixPath = optionalString true ''
+    darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>')
+    if [ -z $darwinPath ]; then
+        echo "error: Changed <darwin-config> but target does not exist, aborting activation" >&2
+        echo "Move you configuration.nix or set NIX_PATH:" >&2
+        echo >&2
+        echo "    nix.nixPath = [ \"darwi-config=${builtins.toString <darwin-config>}\" ];" >&2
+        echo >&2
+        exit 2
+    fi
+
     darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin>')
     if [ -z $darwinPath ]; then
         echo "error: Changed <darwin> but target does not exist, aborting activation" >&2
-- 
cgit v1.2.3