X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fnixops_wrap;h=e50b24687913c4fe7b0b9ea2697ddd09fe3e9359;hb=11234d0798eeb56b2a09bfc66925e782ace465e3;hp=914f2cc79faf84d0225884a155f72fa4d7a43258;hpb=9fb4205e2ceadb79a93cbe44bd77ebebe8c94625;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 914f2cc..e50b246 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -9,15 +9,20 @@ fi
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $(dirname $(dirname $DIR))/nix_path_env
+# __noChroot: ssh-config-file requires relaxed
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
+
+nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
+
 finish() {
   rm -rf "$TEMP"
-  nixops set-args --unset privateFiles
-  nixops set-args --unset nixpkgsNext
+  $nixops set-args --unset privateFiles
 }
 
 trap finish EXIT
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 
@@ -27,8 +32,6 @@ files=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files | sed -e '1d' -e '
 for file in $files; do
   pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file
 done
-nixops set-args --argstr privateFiles "$TEMP"
-nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
+$nixops set-args --argstr privateFiles "$TEMP"
 
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs"
-nixops "$@"
+$nixops "$@"