From aa7b284e6530dba29e2ee113da20f983d80350a2 Mon Sep 17 00:00:00 2001
From: Surma <surma@surma.dev>
Date: Sun, 8 Sep 2024 10:46:45 +0100
Subject: [PATCH] Filter sources

---
 codecs/mozjpeg/flake.nix                      |   5 +++--
 codecs/resize/flake.nix                       |   4 ++--
 .../resize/wasm_build/squoosh_resize_bg.wasm  | Bin 36811 -> 36811 bytes
 codecs/rotate/flake.nix                       |   4 ++--
 codecs/webp/flake.nix                         |  16 ++++++----------
 nix/squoosh-cxx-builder/default.nix           |   3 +--
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/codecs/mozjpeg/flake.nix b/codecs/mozjpeg/flake.nix
index 984d9d92..b0a9849e 100644
--- a/codecs/mozjpeg/flake.nix
+++ b/codecs/mozjpeg/flake.nix
@@ -18,7 +18,7 @@
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) callPackage stdenv;
+        inherit (pkgs) callPackage stdenv lib;
 
         buildSquooshCppCodec = callPackage (import ../../nix/squoosh-cxx-builder) {};
         mkInstallable = callPackage (import ../../nix/mk-installable) {};
@@ -30,8 +30,9 @@
           default = mozjpeg-squoosh;
           mozjpeg-squoosh = buildSquooshCppCodec {
             name = "mozjpeg-squoosh";
-            src = ./.;
+            src = lib.sources.sourceByRegex ./. ["Makefile" "enc(/.+)?"];
             MOZJPEG = mozjpeg;
+
             dontConfigure = true;
             decoder = null;
           };
diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix
index 415b5222..90efea82 100644
--- a/codecs/resize/flake.nix
+++ b/codecs/resize/flake.nix
@@ -15,12 +15,12 @@
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) callPackage;
+        inherit (pkgs) callPackage lib;
 
         buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};};
         mkInstallable = callPackage (import ../../nix/mk-installable) {};
 
-        src = ./.;
+        src = lib.sources.sourceByRegex ./. ["Makefile" "enc(/.+)?"];
       in
       mkInstallable {
         packages = rec {
diff --git a/codecs/resize/wasm_build/squoosh_resize_bg.wasm b/codecs/resize/wasm_build/squoosh_resize_bg.wasm
index 3757062abee1ffcb8617084420aa53eca5de6be0..cc16771c2c7ee80f551d0e6727b9827dc8868059 100644
GIT binary patch
delta 47
zcmX>-pXu~`rVXpg6p9P0G76K6E6OS>E3z{Ziwcv=6D`Y%ic<27%#BPk(l(zeW0V8{
D_6-w{

delta 47
zcmX>-pXu~`rVXpg6b!SIijoY?EGw(bb4`mYbBl}$(kc^k%rdeKbBhde%r>7YW0V8{
D$3GGn

diff --git a/codecs/rotate/flake.nix b/codecs/rotate/flake.nix
index e5e47fac..d61d947c 100644
--- a/codecs/rotate/flake.nix
+++ b/codecs/rotate/flake.nix
@@ -16,12 +16,12 @@
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) callPackage;
+        inherit (pkgs) callPackage lib;
         
         buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};};
         mkInstallable = callPackage (import ../../nix/mk-installable) {};
 
-        src = ./.;
+        src = lib.sources.sourceByRegex ./. ["Cargo\.*" ".*\.rs"];
       in
       mkInstallable {
         packages = rec {
diff --git a/codecs/webp/flake.nix b/codecs/webp/flake.nix
index 6d4c2aeb..eb7d562c 100644
--- a/codecs/webp/flake.nix
+++ b/codecs/webp/flake.nix
@@ -28,21 +28,17 @@
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) lib stdenv runCommand emscripten writeShellScriptBin cmake;
+        inherit (pkgs) lib stdenv runCommand emscripten writeShellScriptBin cmake callPackage;
+        buildSquooshCppCodec = callPackage (import ../../nix/squoosh-cxx-builder) {};
+        mkInstallable = callPackage (import ../../nix/mk-installable) {};
+
         packageVariantBuilder =
           name:
           { simd }@variantOptions:
           {
-            "webp-squoosh-${name}" = stdenv.mkDerivation {
+            "webp-squoosh-${name}" = buildSquooshCppCodec {
               name = "webp-squoosh-${name}";
-              # Only copy files that are actually relevant to avoid unnecessary
-              # cache invalidations.
-              src = runCommand "src" { } ''
-                mkdir $out
-                cp -r ${./.}/enc $out/
-                cp -r ${./.}/dec $out/
-                cp ${./.}/Makefile $out/
-              '';
+              src = lib.sources.sourceByRegex ./. ["Makefile" "enc(/.+)?" "dec(/.+)?"]; 
               nativeBuildInputs = [
                 emscripten
                 self.packages.${system}."webp-${name}"
diff --git a/nix/squoosh-cxx-builder/default.nix b/nix/squoosh-cxx-builder/default.nix
index 94a36b20..b1bde459 100644
--- a/nix/squoosh-cxx-builder/default.nix
+++ b/nix/squoosh-cxx-builder/default.nix
@@ -5,7 +5,6 @@
 }:
 {
   name,
-  src,
   nativeBuildInputs ? [ ],
   encoder ? "enc",
   decoder ? "dec",
@@ -16,7 +15,7 @@ stdenv.mkDerivation (
   final:
   args
   // {
-    inherit name src;
+    inherit name;
     nativeBuildInputs = [ pkgs.emscripten ] ++ nativeBuildInputs;
     buildPhase = ''
       export HOME=$TMPDIR