From bcba9830e4c8f63ea03003b861ae1ac39314a080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 26 Nov 2023 12:32:12 +0100 Subject: [PATCH] drop dependency on gnugrep --- default.nix | 2 -- direnvrc | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index b287a36..f360b69 100644 --- a/default.nix +++ b/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation { postPatch = '' sed -i "2iNIX_BIN_PREFIX=${nix}/bin/" direnvrc - substituteInPlace direnvrc \ - --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = '' diff --git a/direnvrc b/direnvrc index 6e622ea..c8f54f9 100644 --- a/direnvrc +++ b/direnvrc @@ -280,12 +280,14 @@ use_flake() { local flake_input_paths mkdir -p "$flake_inputs" flake_input_paths=$("${NIX_BIN_PREFIX}nix" flake archive \ - --json \ + --json --no-write-lock-file \ --extra-experimental-features "nix-command flakes" \ - --no-write-lock-file \ - "$flake_dir" | grep -E -o '/nix/store/[^"]+') - for path in $flake_input_paths; do - _nix_add_gcroot "$path" "${flake_inputs}/${path##*/}" + "$flake_dir") + + while [[ "$flake_input_paths" =~ /nix/store/[^\"]+ ]]; do + local store_path="${BASH_REMATCH[0]}" + _nix_add_gcroot "${store_path}" "${flake_inputs}/${store_path##*/}" + flake_input_paths="${flake_input_paths/${store_path}/}" done log_status "nix-direnv: renewed cache"