X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;fp=nixops%2Fscripts%2Fsetup;h=72b19c073d00207056a2e2b7e5cc782913012b49;hb=db4f87d640a090c4b469595737503f4189923c45;hp=58dbf5516bbc9a2656526a3d63af008eded150e6;hpb=c58dcd70150d63e01dfe01adbb38244598e6a881;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 58dbf55..72b19c0 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -95,11 +95,10 @@ fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 
-if ! $nixops info 2>/dev/null >/dev/null; then
+if ! nixops_custom info 2>/dev/null >/dev/null; then
   cat <<-EOF
 	Importing deployment file into nixops:
 	Continue? [y/N]
@@ -107,9 +106,9 @@ if ! $nixops info 2>/dev/null >/dev/null; then
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-    echo "$deployment" | $nixops import
+    echo "$deployment" | nixops_custom import
 
-    $nixops modify "$(dirname $DIR)/eldiron.nix"
+    nixops_custom modify "$(dirname $DIR)/eldiron.nix"
   else
     echo "Aborting"
     exit 1