diff --git a/default-plugins.nix b/default-plugins.nix index 788d4d9..e18e341 100644 --- a/default-plugins.nix +++ b/default-plugins.nix @@ -8,6 +8,7 @@ stdenv, binaryen, optimize ? true, + wasmTarget ? "wasm32-wasip1", }: let makeDefaultPlugin = @@ -24,21 +25,21 @@ let protobuf ]; buildPhase = '' - cargo build --package ${name} --release --target=wasm32-wasi + cargo build --package ${name} --release --target=${wasmTarget} mkdir -p $out/bin; ''; installPhase = if optimize then '' wasm-opt \ - -Oz target/wasm32-wasi/release/${name}.wasm \ + -Oz target/${wasmTarget}/release/${name}.wasm \ -o $out/bin/${name}.wasm \ --enable-bulk-memory '' else '' mv \ - target/wasm32-wasi/release/${name}.wasm \ + target/${wasmTarget}/release/${name}.wasm \ $out/bin/${name}.wasm ''; doCheck = false; diff --git a/external-plugins.nix b/external-plugins.nix index 860baf7..aeb84d9 100644 --- a/external-plugins.nix +++ b/external-plugins.nix @@ -8,6 +8,7 @@ stdenv, binaryen, optimize ? true, + wasmTarget ? "wasm32-wasip1", }: let makePlugin = @@ -24,24 +25,24 @@ let protobuf ]; buildPhase = '' - cargo build --package ${name} --release --target=wasm32-wasi + cargo build --package ${name} --release --target=${wasmTarget} mkdir -p $out/bin; ''; installPhase = if optimize then '' wasm-opt \ - -Oz target/wasm32-wasi/release/${name}.wasm \ + -Oz target/${wasmTarget}/release/${name}.wasm \ -o $out/bin/${name}.wasm \ --enable-bulk-memory - substituteInPlace dev.kdl --replace 'file:target/wasm32-wasi/debug/multitask.wasm' "${placeholder "out"}" + substituteInPlace dev.kdl --replace 'file:target/${wasmTarget}/debug/multitask.wasm' "${placeholder "out"}" mkdir -p $out/share; cp dev.kdl $out/share/multitask.kdl '' else '' mv \ - target/wasm32-wasi/release/${name}.wasm \ + target/${wasmTarget}/release/${name}.wasm \ $out/bin/${name}.wasm ''; doCheck = false; diff --git a/flake.lock b/flake.lock index 9d51a05..358345d 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ "zellij": { "flake": false, "locked": { - "lastModified": 1737132764, - "narHash": "sha256-+puChgwTPQDJe1Yh8JzVkyf+fIzrWjLNVz4mbghNAF8=", + "lastModified": 1738253154, + "narHash": "sha256-3pMW9zJaug3adMMXhmDk/Qrr6whes6O5QGFrbCEor0w=", "owner": "zellij-org", "repo": "zellij", - "rev": "fe792643f7d879d4b8ef31fe4ec17438ecc21f29", + "rev": "c0160cf70968a86f8cbb9657ec932440204ccec6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e591ced..c099351 100644 --- a/flake.nix +++ b/flake.nix @@ -126,7 +126,7 @@ rustToolchainTOML = pkgs.rust-bin.fromRustupToolchainFile (src + /rust-toolchain.toml); rustWasmToolchainTOML = rustToolchainTOML.override { extensions = [ ]; - targets = [ "wasm32-wasi" ]; + targets = [ "wasm32-wasip1" ]; }; devInputs = [