allow buildIdris output to be used as a dependency in other buildIdri…

…s calls more directly
idris-lang · Jun 26, 2024 · 0ea7c59 · 0ea7c59
1 parent 5f27842
commit 0ea7c59
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/buildIdris.nix b/nix/buildIdris.nix
@@ -17,11 +17,24 @@
 , ... }@attrs:
 
 let
+  # loop over idrisLibraries and normalize them by turning any that are
+  # direct outputs of the buildIdris function into the `.library {}`
+  # property.
+  idrisLibraryLibs = map (idrisLib:
+    if lib.isDerivation idrisLib
+    then idrisLib
+    else if builtins.isFunction idrisLib
+    then idrisLib {}
+    else if (builtins.isAttrs idrisLib && idrisLib ? "library")
+    then idrisLib.library {}
+    else throw "Found an Idris2 library dependency that was not the result of the buildIdris function"
+  ) idrisLibraries;
+
   propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs);
   ipkgFileName = ipkgName + ".ipkg";
   idrName = "idris2-${idris2Version}";
   libSuffix = "lib/${idrName}";
-  propagatedIdrisLibraries = propagate idrisLibraries;
+  propagatedIdrisLibraries = propagate idrisLibraryLibs;
   libDirs =
     lib.strings.makeSearchPath libSuffix propagatedIdrisLibraries;
   drvAttrs = builtins.removeAttrs attrs [