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 local flakes when prefixed with "path:" (again)

Browse source 
This change fixes regression introduced in commit
4bf5d40290. In particular, we should not
be passing flake URI without schema to the nix flake archive command.
This commit is contained in:
Ivan Trubach 2024-03-31 19:40:44 +03:00 • committed by Mic92
parent 29028eed87
commit 5f6a74b01c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
direnvrc
View file

@ -247,8 +247,8 @@ use_flake() {
fi fi
flake_expr="${1:-.}" flake_expr="${1:-.}"
flake_dir="${flake_expr%#*}" flake_uri="${flake_expr%#*}"
flake_dir=${flake_dir#"path:"} flake_dir=${flake_uri#"path:"}
if [[ $flake_expr == -* ]]; then if [[ $flake_expr == -* ]]; then
local message="the first argument must be a flake expression" local message="the first argument must be a flake expression"
@ -310,7 +310,7 @@ use_flake() {
mkdir -p "$flake_inputs" mkdir -p "$flake_inputs"
flake_input_paths=$(_nix flake archive \ flake_input_paths=$(_nix flake archive \
--json --no-write-lock-file \ --json --no-write-lock-file \
"$flake_dir") -- "$flake_uri")
while [[ $flake_input_paths =~ /nix/store/[^\"]+ ]]; do while [[ $flake_input_paths =~ /nix/store/[^\"]+ ]]; do
local store_path="${BASH_REMATCH[0]}" local store_path="${BASH_REMATCH[0]}"