X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fmake-env;h=25aa869a210453a83699c3ceb4e523e2bc01a09d;hb=3ad9ed631c49febd2127baaa352d8f0ed9c3b2ea;hp=983a3590ec67ce76d919bd1afcc9dc3e6e7d875d;hpb=96a0e5a25655477e4d24a041745a9f2a6720c0db;p=perso%2FImmae%2FConfig%2FNix%2FNUR.git

diff --git a/scripts/make-env b/scripts/make-env
index 983a3590..25aa869a 100755
--- 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