From ff3fee3ae5490fbccf8529aac2c7805c87fc4975 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 14 Sep 2024 10:29:52 -0500
Subject: [PATCH] plugins/direnv: use direnvPackage

---
 plugins/by-name/direnv/default.nix                    | 11 ++++++++++-
 tests/test-sources/plugins/by-name/direnv/default.nix |  7 +++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/by-name/direnv/default.nix b/plugins/by-name/direnv/default.nix
index 2a305e3b..7fa9539a 100644
--- a/plugins/by-name/direnv/default.nix
+++ b/plugins/by-name/direnv/default.nix
@@ -10,7 +10,6 @@ helpers.vim-plugin.mkVimPlugin {
   originalName = "direnv.vim";
   package = "direnv-vim";
   globalPrefix = "direnv_";
-  extraPackages = [ pkgs.direnv ];
 
   maintainers = [ helpers.maintainers.alisonjenkins ];
 
@@ -36,4 +35,14 @@ helpers.vim-plugin.mkVimPlugin {
       Stop echoing output from Direnv command.
     '';
   };
+
+  extraOptions = {
+    direnvPackage = lib.mkPackageOption pkgs "direnv" {
+      nullable = true;
+    };
+  };
+
+  extraConfig = cfg: {
+    extraPackages = [ cfg.direnvPackage ];
+  };
 }
diff --git a/tests/test-sources/plugins/by-name/direnv/default.nix b/tests/test-sources/plugins/by-name/direnv/default.nix
index 43b21442..8b58818a 100644
--- a/tests/test-sources/plugins/by-name/direnv/default.nix
+++ b/tests/test-sources/plugins/by-name/direnv/default.nix
@@ -14,4 +14,11 @@
       };
     };
   };
+
+  no-packages = {
+    plugins.direnv = {
+      enable = true;
+      direnvPackage = null;
+    };
+  };
 }