From d00d00998ea9a32b68327e6efdc606bd635ac6f7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 24 Feb 2019 22:27:41 +0100
Subject: darwin: replace usages of nix-instantiate --eval with --find-file

---
 modules/system/checks.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/system/checks.nix b/modules/system/checks.nix
index 41236ec..f22b1e7 100644
--- a/modules/system/checks.nix
+++ b/modules/system/checks.nix
@@ -83,21 +83,21 @@ let
   '';
 
   nixPath = ''
-    darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>' || echo "$HOME/.nixpkgs/darwin-configuration.nix") || true
+    darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --find-file darwin-config) || true
     if ! test -e "$darwinConfig"; then
         echo "error: Changed <darwin-config> but target does not exist, aborting activation" >&2
-        echo "Create $darwinConfig or set environment.darwinConfig:" >&2
+        echo "Create ''${darwinConfig:-~/.nixpkgs/darwin-configuration.nix} or set environment.darwinConfig:" >&2
         echo >&2
-        echo "    environment.darwinConfig = \"$(nix-instantiate --eval -E '<darwin-config>' 2> /dev/null || echo '***')\";" >&2
+        echo "    environment.darwinConfig = \"$(nix-instantiate --find-file darwin-config 2> /dev/null || echo '***')\";" >&2
         echo >&2
         echo "And rebuild using (only required once)" >&2
-        echo "$ darwin-rebuild switch -I \"darwin-config=$(nix-instantiate --eval -E '<darwin-config>' 2> /dev/null || echo '***')\"" >&2
+        echo "$ darwin-rebuild switch -I \"darwin-config=$(nix-instantiate --find-file darwin-config 2> /dev/null || echo '***')\"" >&2
         echo >&2
         echo >&2
         exit 2
     fi
 
-    darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin>') || true
+    darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --find-file darwin) || true
     if ! test -e "$darwinPath"; then
         echo "error: Changed <darwin> but target does not exist, aborting activation" >&2
         echo "Add the darwin repo as a channel or set nix.nixPath:" >&2
@@ -106,12 +106,12 @@ let
         echo >&2
         echo "or set" >&2
         echo >&2
-        echo "    nix.nixPath = [ \"darwin=$(nix-instantiate --eval -E '<darwin>')\" ];" >&2
+        echo "    nix.nixPath = [ \"darwin=$(nix-instantiate --find-file darwin 2> /dev/null || echo '***')\" ];" >&2
         echo >&2
         exit 2
     fi
 
-    nixpkgsPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<nixpkgs>') || true
+    nixpkgsPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --find-file nixpkgs) || true
     if ! test -e "$nixpkgsPath"; then
         echo "error: Changed <nixpkgs> but target does not exist, aborting activation" >&2
         echo "Add a nixpkgs channel or set nix.nixPath:" >&2
@@ -120,7 +120,7 @@ let
         echo >&2
         echo "or set" >&2
         echo >&2
-        echo "    nix.nixPath = [ \"nixpkgs=$(nix-instantiate --eval -E '<nixpkgs>')\" ];" >&2
+        echo "    nix.nixPath = [ \"nixpkgs=$(nix-instantiate --find-file nixpkgs 2> /dev/null || echo '***')\" ];" >&2
         echo >&2
         exit 2
     fi
-- 
cgit v1.2.3