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

Merge pull request #12 from nix-community/direnv-layout-dir

Browse source 
Respect direnv-layout-dir
This commit is contained in:
Jörg Thalheim 2020-04-10 13:25:50 +01:00 • committed by GitHub
commit 546379f063
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
direnvrc
View file

@ -1,5 +1,7 @@
# shellcheck shell=bash # shellcheck shell=bash
: "${direnv_layout_dir:=.direnv}"
use_nix() { use_nix() {
local path local path
path="$(nix-instantiate --find-file nixpkgs)" path="$(nix-instantiate --find-file nixpkgs)"
@ -22,7 +24,7 @@ use_nix() {
fi fi
fi fi
local cache=".direnv/cache-${version:-unknown}" local cache="${direnv_layout_dir}/cache-${version:-unknown}"
local update_drv=0 local update_drv=0
if [[ ! -e "$cache" ]] || \ if [[ ! -e "$cache" ]] || \
@ -31,7 +33,7 @@ use_nix() {
[[ default.nix -nt "$cache" ]] || \ [[ default.nix -nt "$cache" ]] || \
[[ shell.nix -nt "$cache" ]]; [[ shell.nix -nt "$cache" ]];
then then
[[ -d .direnv ]] || mkdir .direnv [[ -d "${direnv_layout_dir}" ]] || mkdir "${direnv_layout_dir}"
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 "$@" --run "$dump_cmd" \ tmp=$(nix-shell --show-trace --pure "$@" --run "$dump_cmd" \
@ -77,7 +79,7 @@ use_nix() {
# This part is based on https://discourse.nixos.org/t/what-is-the-best-dev-workflow-around-nix-shell/418/4 # This part is based on https://discourse.nixos.org/t/what-is-the-best-dev-workflow-around-nix-shell/418/4
if [[ "${out:-}" != "" ]] && (( update_drv )); then if [[ "${out:-}" != "" ]] && (( update_drv )); then
local drv_link=".direnv/drv" drv local drv_link="${direnv_layout_dir}/drv" drv
drv=$(nix show-derivation "$out" | grep -E -o -m1 '/nix/store/.*.drv') drv=$(nix show-derivation "$out" | grep -E -o -m1 '/nix/store/.*.drv')
local stripped_pwd=${PWD/\//} local stripped_pwd=${PWD/\//}
local escaped_pwd=${stripped_pwd//-/--} local escaped_pwd=${stripped_pwd//-/--}