X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fscripts%2Fnixops_wrap;h=e50b24687913c4fe7b0b9ea2697ddd09fe3e9359;hb=11234d0798eeb56b2a09bfc66925e782ace465e3;hp=e4f5dc5e94c51f9df2f5f34c90ba5189a11e47f5;hpb=941bfb6ff039b6bfd94cc5aec8a0ef6dd1b82f36;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index e4f5dc5..e50b246 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -10,6 +10,10 @@ 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() { @@ -30,7 +34,4 @@ for file in $files; do done $nixops set-args --argstr privateFiles "$TEMP" -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 "$@"