X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fmake-env;h=25aa869a210453a83699c3ceb4e523e2bc01a09d;hb=5ea02e5164d6be1eba8e7b2341105205ead98a87;hp=ebb1eed2ec1ad9ef2cc92069ac6f38995ff306ee;hpb=24fd1fe6c62b7a9fc347794fde043285da272f5c;p=perso%2FImmae%2FConfig%2FNix%2FNUR.git

diff --git a/scripts/make-env b/scripts/make-env
index ebb1eed2..25aa869a 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -2,10 +2,11 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-source $(dirname $DIR)/nix_path_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 "$@"
-$($DIR/nix_infos | sed -e "s/^/#   /")
+Ran $(date) with args "$@" and returned "$result"
+$(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/    /")
 EOF