Rework source filtering.

To actually avoid triggering unnecessary rebuilds when irrelevant files change.
zeroishero · Jan 4, 2023 · f2e8954 · f2e8954
1 parent 426d650
commit f2e8954
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@ vendor
 vendor.tar
 .vscode
 *.log
-result
+/result
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
     crane = {
       url = "github:ipetkov/crane";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -14,20 +15,22 @@
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, crane, fenix }:
+  outputs = { self, nixpkgs, flake-utils, nix-filter, crane, fenix }:
     flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
         craneLib = crane.lib.${system}.overrideToolchain fenix.packages.${system}.stable.toolchain;
 
         pkgDef = {
-          src = pkgs.nix-gitignore.gitignoreSource [
-            "flake.nix"
-            "flake.lock"
-            "data"
-            "debian"
-            "LICENSE"
-          ] ./.;
+          src = nix-filter.lib.filter {
+            root = ./.;
+            include = [
+              ./src
+              ./Cargo.toml
+              ./Cargo.lock
+              ./resources
+            ];
+          };
           nativeBuildInputs = with pkgs; [ pkg-config autoPatchelfHook ];
           buildInputs = with pkgs; [
             wayland
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ vendor @@
     vendor.tar
     .vscode
     *.log
-    result
+    /result