chore(nix): replace nix-filter with lib.fileset

Signed-off-by: Harald Hoyer <[email protected]>
matter-labs · Feb 15, 2024 · 26d53ad · 26d53ad
1 parent 761d546
commit 26d53ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/flake.nix b/flake.nix
@@ -18,8 +18,6 @@
       url = "github:oxalica/rust-overlay?rev=3ad32bb27c700b59306224e285b66577e3532dfc";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nix-filter.url = "github:numtide/nix-filter?rev=3449dc925982ad46246cfc36469baf66e1b64f17";
   };
 
   outputs = inputs:
@@ -32,7 +30,6 @@
       overlays = with inputs; [
         nixsgx-flake.overlays.default
         rust-overlay.overlays.default
-        nix-filter.overlays.default
       ];
 
       alias = {

diff --git a/packages/teepot/default.nix b/packages/teepot/default.nix
@@ -1,7 +1,6 @@
 { lib
 , gccStdenv
 , makeRustPlatform
-, nix-filter
 , nixsgx
 , pkg-config
 , rust-bin
@@ -30,17 +29,17 @@ rustPlatform.buildRustPackage {
     nixsgx.sgx-dcap.quote_verify
   ];
 
-  src = nix-filter {
+  src = with lib.fileset; toSource {
     root = ./../..;
-    include = [
-      "Cargo.lock"
-      "Cargo.toml"
-      "assets"
-      "bin"
-      "crates"
-      "rust-toolchain.toml"
-      "src"
-      "tests"
+    fileset = unions [
+      ../../Cargo.lock
+      ../../Cargo.toml
+      ../../assets
+      ../../bin
+      ../../crates
+      ../../rust-toolchain.toml
+      ../../src
+      ../../tests
     ];
   };
   RUSTFLAGS = "--cfg mio_unsupported_force_waker_pipe";