Use lib.packagesFromDirectoryRecursive (#32)

9999years · Apr 4, 2024 · b59d6d1 · b59d6d1
1 parent d6b0d28
commit b59d6d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 71 deletions.
diff --git a/nix/makePackages.nix b/nix/makePackages.nix
@@ -4,11 +4,10 @@
   inputs,
 }:
 lib.makeScope newScope (
-  self: let
-    packagesFromDirectory = (import ./packagesFromDirectory.nix) {
-      inherit lib;
+  self:
+    {inherit inputs;}
+    // (lib.packagesFromDirectoryRecursive {
+      directory = inputs.self + "/nix/packages";
       inherit (self) callPackage;
-    };
-  in
-    {inherit inputs;} // (packagesFromDirectory "./packages")
+    })
 )
diff --git a/nix/packagesFromDirectory.nix b/nix/packagesFromDirectory.nix