From f0f765e96e0a2dae17e98c4a1c1872a484f1f6fe Mon Sep 17 00:00:00 2001
From: shivaraj-bh <sbh69840@gmail.com>
Date: Tue, 27 Aug 2024 01:16:05 +0530
Subject: [PATCH] nix-direnv: Override the `nix-direnv` package with `nix` from
 `config.nix.package`

This is to match the behaviour with upstream nixpkgs:
https://github.com/NixOS/nixpkgs/blob/6a9d18e057c1dbd6acefa6fe094de8f3c68051a2/nixos/modules/programs/direnv.nix#L64
---
 modules/programs/direnv.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 4a7636705..63bce6212 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -92,7 +92,17 @@ in {
         [nix-direnv](https://github.com/nix-community/nix-direnv),
         a fast, persistent use_nix implementation for direnv'';
 
-      package = mkPackageOption pkgs "nix-direnv" { };
+      package = mkOption {
+        default = pkgs.nix-direnv.override {
+          nix =
+            if config.nix.package == null then pkgs.nix else config.nix.package;
+        };
+        defaultText = "pkgs.nix-direnv";
+        type = types.package;
+        description = ''
+          The nix-direnv package to use
+        '';
+      };
     };
 
     silent = mkEnableOption "silent mode, that is, disabling direnv logging";