From 9bbfac62e8454b1140528fb90a0e7a0befad24bb Mon Sep 17 00:00:00 2001 From: Surma Date: Thu, 8 Aug 2024 00:28:21 +0100 Subject: [PATCH] Trying to do a wasm-bindgen build --- codecs/resize/flake.nix | 22 ++++++++++++++++++---- codecs/resize/package-lock.json | 4 ---- codecs/resize/package.json | 6 ------ 3 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 codecs/resize/package-lock.json delete mode 100644 codecs/resize/package.json diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix index 0e5200c5..c7b6dd01 100644 --- a/codecs/resize/flake.nix +++ b/codecs/resize/flake.nix @@ -34,12 +34,26 @@ { packages = rec { default = resize-squoosh; - resize-squoosh = naersk'.buildPackage { + resize-squoosh = stdenv.mkDerivation { name = "squoosh-resize"; src = ./.; - release = true; - copyLibs = true; - CARGO_BUILD_TARGET = target; + nativeBuildInputs = [ + #naersk' + toolchain + # wasm-pack + wasm-bindgen-cli + ]; + dontConfigure = true; + buildPhase = '' + export CARGO_HOME=$TMPDIR/.cargo + cargo build --target wasm32-unknown-unknown -r + wasm-bindgen --target web --out-dir $out ./target/wasm32-unknown-unknown/release/*.wasm + ''; + dontInstall = true; + # installPhase = '' + # mkdir -p $out + # cp -r pkg/* $out + # ''; }; installScript = writeShellScriptBin "install.sh" '' diff --git a/codecs/resize/package-lock.json b/codecs/resize/package-lock.json deleted file mode 100644 index ca1a498d..00000000 --- a/codecs/resize/package-lock.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "resize", - "lockfileVersion": 1 -} diff --git a/codecs/resize/package.json b/codecs/resize/package.json deleted file mode 100644 index facaf7d4..00000000 --- a/codecs/resize/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "resize", - "scripts": { - "build": "../build-rust.sh" - } -}