doctrine/lib: refactor 'close' helper

1 files changed, 13 insertions, 3 deletions

diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix
index 1b03fe1..5e2eb44 100644
--- a/doctrine/lib/default.nix
+++ b/doctrine/lib/default.nix
@@ -3,8 +3,18 @@
   doctrine,
   pkgs,
 }: let
-  close = f: args: f (args // {inherit lib pkgs doctrine;});
+  close = vars: f: args:
+    (
+      if builtins.isPath f
+      then import f
+      else f
+    )
+    (args // vars);
+
+  closeLib = close {inherit lib;};
+  closeFull = close {inherit lib pkgs doctrine;};
 in {
-  importAll = pkgs.callPackage ./importAll.nix {};
-  mkModule = close (import ./mk-module.nix);
+  inherit close;
+  importAll = closeLib ./importAll.nix;
+  mkModule = closeFull ./mk-module.nix;
 }