Fix local flakes when prefixed with "path:" (again)

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

View File

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