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

add NIX_BIN_PREFIX to hardcode nix

Browse source
This commit is contained in:
Jörg Thalheim 2021-01-02 11:06:53 +01:00
parent a5d469806c
commit f289bce100
No known key found for this signature in database
GPG key ID: 003F2096411B5F92
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
default.nix
View file

@ -8,9 +8,8 @@ stdenv.mkDerivation {
postPatch = '' postPatch = ''
substituteInPlace direnvrc \ substituteInPlace direnvrc \
--replace "grep" "${gnugrep}/bin/grep" \ --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nixFlakes}/bin/}" \
--replace "nix-shell" "${nix}/bin/nix-shell" \ --replace "grep" "${gnugrep}/bin/grep"
--replace "nix-instantiate" "${nix}/bin/nix-instantiate"
''; '';
installPhase = '' installPhase = ''

19
direnvrc
View file

@ -1,5 +1,7 @@
# shellcheck shell=bash # shellcheck shell=bash
NIX_BIN_PREFIX=${NIX_BIN_PREFIX:-}
_nix_export_or_unset() { _nix_export_or_unset() {
local key=$1 value=$2 local key=$1 value=$2
if [[ "$value" == __UNSET__ ]]; then if [[ "$value" == __UNSET__ ]]; then
@ -69,6 +71,10 @@ use_flake() {
local tmp_profile="$(direnv_layout_dir)/flake-profile.$$" local tmp_profile="$(direnv_layout_dir)/flake-profile.$$"
[[ -d "$(direnv_layout_dir)" ]] || mkdir -p "$(direnv_layout_dir)" [[ -d "$(direnv_layout_dir)" ]] || mkdir -p "$(direnv_layout_dir)"
local tmp_profile_rc=$(nix print-dev-env --profile "$tmp_profile") local tmp_profile_rc=$(nix print-dev-env --profile "$tmp_profile")
local tmp_profile_rc
tmp_profile_rc=$("${NIX_BIN_PREFIX}nix" print-dev-env \
--experimental-features "nix-command flakes" \
--profile "$tmp_profile")
# macos does not have realpath # macos does not have realpath
if command -v realpath >/dev/null; then if command -v realpath >/dev/null; then
drv=$(realpath "$tmp_profile") drv=$(realpath "$tmp_profile")
@ -80,7 +86,10 @@ use_flake() {
_nix_add_gcroot "$drv" "$profile" _nix_add_gcroot "$drv" "$profile"
# also add garbage collection root for source # also add garbage collection root for source
local flake_source=$(nix eval --impure --raw --expr 'builtins.getFlake (toString ./.)') local flake_source
flake_source=$("${NIX_BIN_PREFIX}nix" eval \
--experimental-features "nix-command flakes" \
--impure --raw --expr 'builtins.getFlake (toString ./.)')
_nix_add_gcroot "$flake_source" "$flake" _nix_add_gcroot "$flake_source" "$flake"
log_status renewed cache log_status renewed cache
@ -112,6 +121,7 @@ use_nix() {
local path direnv_dir local path direnv_dir
path=$(nix-instantiate --find-file nixpkgs) path=$(nix-instantiate --find-file nixpkgs)
direnv_dir=$(direnv_layout_dir) direnv_dir=$(direnv_layout_dir)
path=$("${NIX_BIN_PREFIX}nix-instantiate" --find-file nixpkgs)
if [[ "${direnv:-}" == "" ]]; then if [[ "${direnv:-}" == "" ]]; then
log_status "\$direnv environment variable was not defined. Was this script run inside direnv?" log_status "\$direnv environment variable was not defined. Was this script run inside direnv?"
@ -144,7 +154,9 @@ use_nix() {
[[ -d "$direnv_dir" ]] || mkdir -p "$direnv_dir" [[ -d "$direnv_dir" ]] || mkdir -p "$direnv_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_BIN_PREFIX}nix-shell" \
--experimental-features "nix-command flakes" \
--show-trace --pure "$@" --run "$dump_cmd")
# show original shell hook output # show original shell hook output
echo "$tmp" | grep -vP '(?<=_____direnv_____).*' echo "$tmp" | grep -vP '(?<=_____direnv_____).*'
echo "$tmp" | grep -oP '(?<=_____direnv_____).*' > "$cache" echo "$tmp" | grep -oP '(?<=_____direnv_____).*' > "$cache"
@ -161,6 +173,9 @@ use_nix() {
if [[ "${out:-}" != "" ]] && (( update_drv )); then if [[ "${out:-}" != "" ]] && (( update_drv )); then
local drv_link="${direnv_dir}/drv" drv local drv_link="${direnv_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')
drv=$("${NIX_BIN_PREFIX}nix" show-derivation "$out" \
--experimental-features "nix-command flakes" \
| grep -E -o -m1 '/nix/store/.*.drv')
_nix_add_gcroot "$drv" "$drv_link" _nix_add_gcroot "$drv" "$drv_link"
log_status renewed cache and derivation link log_status renewed cache and derivation link
fi fi