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

diff --git a/scripts/make-env b/scripts/make-env
index ebb1eed..25aa869 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