nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix broken eval a second time

Browse source
This commit is contained in:
Jörg Thalheim 2019-10-23 14:09:01 +01:00
parent 9ce7643b1b
commit f988975869
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
direnvrc
View file

@ -35,8 +35,8 @@ use_nix() {
[[ -d .direnv ]] || mkdir .direnv [[ -d .direnv ]] || mkdir .direnv
local dump_cmd tmp local dump_cmd tmp
dump_cmd="echo -n _____direnv_____; \"$direnv\" dump bash" dump_cmd="echo -n _____direnv_____; \"$direnv\" dump bash"
tmp=$(nix-shell --show-trace --pure "$@" \ tmp=$(nix-shell --show-trace --pure "$@" --run "$dump_cmd" \
--run "$dump_cmd" | grep -oP '(?<=_____direnv_____).*') | grep -oP '(?<=_____direnv_____).*')
echo "$tmp" > "$cache" echo "$tmp" > "$cache"
update_drv=1 update_drv=1
else else
@ -48,7 +48,8 @@ use_nix() {
fi fi
log_status eval "$cache" log_status eval "$cache"
eval < "$cache" read -r cache_content < "$cache"
eval "$cache_content"
export PATH=$PATH:$path_backup TERM=$term_backup TMPDIR=$tmp_backup export PATH=$PATH:$path_backup TERM=$term_backup TMPDIR=$tmp_backup
if [ -z ${tmp_backup+x} ]; then if [ -z ${tmp_backup+x} ]; then
export TMPDIR=${tmp_backup} export TMPDIR=${tmp_backup}