Automatically filter out empty directories in cleanCargoSource

ipetkov · Oct 23, 2024 · b24a7fd · b24a7fd
1 parent fa8b744
commit b24a7fd
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/cleanCargoSource.nix b/lib/cleanCargoSource.nix
@@ -3,12 +3,17 @@
 , lib
 }:
 
-src: lib.cleanSourceWith {
-  # Apply the default source cleaning from nixpkgs
-  src = lib.cleanSource src;
+src: lib.fileset.toSource {
+  root = src;
 
-  # Then add our own filter on top
-  filter = filterCargoSources;
+  # Filter out empty directories by converting back and forth from a file set
+  fileset = lib.fileset.fromSource (lib.cleanSourceWith {
+    # Apply the default source cleaning from nixpkgs
+    src = lib.cleanSource src;
 
-  name = internalCrateNameForCleanSource src;
+    # Then add our own filter on top
+    filter = filterCargoSources;
+
+    name = internalCrateNameForCleanSource src;
+  });
 }