Use Makefile for some env/deploy scripts

[perso/Immae/Config/Nix/NUR.git] / scripts / make-env

diff --git a/scripts/make-env b/scripts/make-env
index 983a3590ec67ce76d919bd1afcc9dc3e6e7d875d..25aa869a210453a83699c3ceb4e523e2bc01a09d 100755 (executable)
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -2,11 +2,11 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-source $DIR/nix_env
+eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)"
 nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@"
 result=$?
 
 cat >> $(dirname $DIR)/versions_log <<EOF
 Ran $(date) with args "$@" and returned "$result"
-$($DIR/nix_infos | sed -e "s/^/    /")
+$(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/    /")
 EOF