From 9d4a2cf0a6947893587e2300a8b2c870e099f4a1 Mon Sep 17 00:00:00 2001
From: Arthur Noel <arthur@ischium.net>
Date: Tue, 19 Dec 2023 19:43:10 +0000
Subject: [PATCH] consistently use $direnv builtin

---
 default.nix | 7 +++++--
 direnvrc    | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index bbfea9e..edfa587 100644
--- a/default.nix
+++ b/default.nix
@@ -24,7 +24,7 @@ resholve.mkDerivation rec {
     default = {
       scripts = [ "share/${pname}/direnvrc" ];
       interpreter = "none";
-      inputs = [ coreutils direnv nix ];
+      inputs = [ coreutils nix ];
       fake = {
         builtin = [
           "PATH_add"
@@ -40,7 +40,10 @@ resholve.mkDerivation rec {
           "shasum"
         ];
       };
-      keep."$cmd" = true;
+      keep = {
+        "$cmd" = true;
+        "$direnv" = true;
+      };
       execer = [
         "cannot:${direnv}/bin/direnv"
         "cannot:${nix}/bin/nix"
diff --git a/direnvrc b/direnvrc
index b23d460..bbedc7f 100644
--- a/direnvrc
+++ b/direnvrc
@@ -39,7 +39,8 @@ _nix() {
 _require_version() {
   local cmd=$1 version=$2 required=$3
   if ! printf "%s\n" "$required" "$version" | sort --check=quiet --version-sort; then
-    _nix_direnv_fatal "minimum required $cmd version is $required (installed: $version)"
+    _nix_direnv_fatal \
+      "minimum required $(basename "$cmd") version is $required (installed: $version)"
   fi
 }
 
@@ -219,7 +220,7 @@ _nix_direnv_watches() {
       path=$(printf "$path")
       _watches+=("$path")
     fi
-  done < <(direnv show_dump "${DIRENV_WATCHES}")
+  done < <($direnv show_dump "${DIRENV_WATCHES}")
 }
 
 _nix_direnv_manual_reload=0