Minor refactor

GoogleChromeLabs · Sep 6, 2024 · fae5959 · fae5959
1 parent 53fc922
commit fae5959
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 89 deletions.
diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix
@@ -17,15 +17,14 @@
         pkgs = nixpkgs.legacyPackages.${system};
         inherit (pkgs) callPackage writeShellScriptBin;
 
-        squooshCodecBuilders = callPackage (import ../../nix/squoosh-codec-builders) {fenix = fenix.packages.${system};};
-        inherit (squooshCodecBuilders) buildSquooshCodecRust;
-
+        buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};};
+
         src = ./.;
       in
       {
         packages = rec {
           default = resize-squoosh;
-          resize-squoosh = buildSquooshCodecRust {
+          resize-squoosh = buildSquooshRustCodec {
             name = "resize-squoosh";
             inherit src;
             cargoLock = {

diff --git a/codecs/rotate/flake.nix b/codecs/rotate/flake.nix
@@ -18,15 +18,14 @@
         pkgs = nixpkgs.legacyPackages.${system};
         inherit (pkgs) callPackage writeShellScriptBin;
 
-        squooshCodecBuilders = callPackage (import ../../nix/squoosh-codec-builders) {fenix = fenix.packages.${system};};
-        inherit (squooshCodecBuilders) buildSquooshCodecRust;
+        buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};};
 
         src = ./.;
       in
       {
         packages = rec {
           default = rotate-squoosh;
-          rotate-squoosh = buildSquooshCodecRust {
+          rotate-squoosh = buildSquooshRustCodec {
             name = "rotate-squoosh";
             inherit src;
             cargoLock = {

diff --git a/nix/squoosh-codec-builders/default.nix b/nix/squoosh-codec-builders/default.nix
diff --git a/nix/squoosh-rust-builder/default.nix b/nix/squoosh-rust-builder/default.nix
@@ -0,0 +1,78 @@
+{
+  pkgs,
+  fenix,
+  wasm-bindgen ? pkgs.callPackage (import ../wasm-bindgen) { },
+  rust-helpers ? pkgs.callPackage (import ../rust-helpers) { inherit fenix; },
+  binaryen,
+  stdenv,
+}:
+let
+  inherit (rust-helpers) buildRustPackage;
+in
+
+{
+  name,
+  src,
+  cargoLock ? {
+    lockFile = "${src}/Cargo.lock";
+  },
+  wasmBindgen ? {
+    sha256 = "";
+  },
+  ...
+}@args:
+let
+  codecBuild = buildRustPackage {
+    inherit src cargoLock;
+    name = "${name}-codec";
+    target = "wasm32-unknown-unknown";
+  };
+
+  wasm-bindgen-bin = wasm-bindgen.buildFromCargoLock {
+    inherit cargoLock;
+    sha256 = wasmBindgen.sha256;
+  };
+in
+if wasmBindgen != null then
+  stdenv.mkDerivation (
+    (removeAttrs args [
+      "cargoLock"
+      "wasmBindgen"
+    ])
+    // {
+      inherit codecBuild;
+      dontConfigure = true;
+      nativeBuildInputs = [ wasm-bindgen-bin ];
+      buildPhase = ''
+        runHook preBuild
+
+        wasm-bindgen --target web --out-dir $out $codecBuild/*.wasm
+
+        runHook postBuild
+      '';
+      dontInstall = true;
+    }
+  )
+else
+  stdenv.mkDerivation (
+    (removeAttrs args [
+      "cargoLock"
+      "wasmBindgen"
+    ])
+    // {
+      inherit codecBuild;
+      dontConfigure = true;
+      nativeBuildInputs = [ binaryen ];
+      buildPhase = ''
+        runHook preBuild
+
+        wasm-opt -O3 --strip -o optimized.wasm $codecBuild/*.wasm
+
+        runHook postBuild
+      '';
+      installPhase = ''
+        mkdir -p $out
+        cp optimized.wasm $out
+      '';
+    }
+  )