Port rotate codec to nix

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

Hide file tree

Showing 7 changed files with 195 additions and 5 deletions.
diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix
@@ -18,15 +18,16 @@
         inherit (pkgs) callPackage writeShellScriptBin;
 
         squooshCodecBuilders = callPackage (import ../../nix/squoosh-codec-builders) {fenix = fenix.packages.${system};};
+        inherit (squooshCodecBuilders) buildSquooshCodecRust;
 
         src = ./.;
       in
       {
         packages = rec {
           default = resize-squoosh;
-          resize-squoosh = squooshCodecBuilders.buildSquooshCodecRust {
+          resize-squoosh = buildSquooshCodecRust {
             name = "resize-squoosh";
-            inherit system src;
+            inherit src;
             cargoLock = {
               lockFile = "${src}/Cargo.lock";
             };

diff --git a/codecs/rotate/flake.lock b/codecs/rotate/flake.lock
diff --git a/codecs/rotate/flake.nix b/codecs/rotate/flake.nix
@@ -0,0 +1,51 @@
+
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/24.05";
+    flake-utils.url = "github:numtide/flake-utils";
+    fenix.url = "github:nix-community/fenix/7bad6c7ff73b784a9c7de9147626c8d5d5072809";
+  };
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      fenix
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        inherit (pkgs) callPackage writeShellScriptBin;
+
+        squooshCodecBuilders = callPackage (import ../../nix/squoosh-codec-builders) {fenix = fenix.packages.${system};};
+        inherit (squooshCodecBuilders) buildSquooshCodecRust;
+
+        src = ./.;
+      in
+      {
+        packages = rec {
+          default = rotate-squoosh;
+          rotate-squoosh = buildSquooshCodecRust {
+            name = "rotate-squoosh";
+            inherit src;
+            cargoLock = {
+              lockFile = "${src}/Cargo.lock";
+            };
+            wasmBindgen = null;
+          };
+
+          installScript = writeShellScriptBin "install.sh" ''
+            ${pkgs.coreutils}/bin/mkdir -p wasm_build
+            ${pkgs.rsync}/bin/rsync --chmod=u+w -r ${self.packages.${system}.rotate-squoosh}/* wasm_build/
+          '';
+        };
+        apps = {
+          install = {
+            type = "app";
+            program = "${self.packages.${system}.installScript}/bin/install.sh";
+          };
+        };
+      }
+    );
+}
diff --git a/codecs/rotate/rotate.wasm b/codecs/rotate/rotate.wasm
diff --git a/codecs/rotate/wasm_build/optimized.wasm b/codecs/rotate/wasm_build/optimized.wasm
diff --git a/nix/squoosh-codec-builders/default.nix b/nix/squoosh-codec-builders/default.nix
@@ -3,6 +3,7 @@
   fenix,
   wasm-bindgen ? pkgs.callPackage (import ../wasm-bindgen) { },
   rust-helpers ? pkgs.callPackage (import ../rust-helpers) { inherit fenix; },
+  binaryen,
   stdenv,
 }:
 let
@@ -43,7 +44,7 @@ in
         // {
           inherit codecBuild;
           dontConfigure = true;
-          nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ wasm-bindgen-bin ];
+          nativeBuildInputs = [ wasm-bindgen-bin ];
           buildPhase = ''
             runHook preBuild
 
@@ -55,5 +56,27 @@ in
         }
       )
     else
-      codecBuild;
+      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
+          '';
+        }
+      );
+
 }
diff --git a/src/features/preprocessors/rotate/worker/rotate.ts b/src/features/preprocessors/rotate/worker/rotate.ts
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import wasmUrl from 'url:codecs/rotate/rotate.wasm';
+import wasmUrl from 'url:codecs/rotate/wasm_build/optimized.wasm';
 import { Options } from '../shared/meta';
 
 export interface RotateModuleInstance {