From 802741a5292636b9a1619c712e128a77976e9d31 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 30 May 2024 17:29:18 +0200
Subject: add local submodules to nix path

---
 lib/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index a02fe34b..2cbaf55c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -7,12 +7,19 @@ rec {
   importPathStore = p: "${append ../. "/${p}"}";
 
   mkPathable = s: toString (
-    if s.type == "local"
-    then (lib.path.append ../. s.outPath)
-    else s.outPath
+    if lib.path.subpath.isValid s
+    then (lib.path.append ../. s)
+    else s
   );
 
+  kvPath = k: v: "${k}=${v}";
+
+  fromSources = sources:
+    lib.attrsets.mapAttrs
+      (k: v: v.outPath)
+      sources;
+
   mkNixPath = sources: lib.attrsets.mapAttrsToList
-    (k: v: "${k}=${mkPathable v}")
-    (removeAttrs sources [ "__functor" ]);
+    (k: v: kvPath k (mkPathable v))
+    sources;
 }
-- 
cgit 1.4.1