diff --git a/crates/wasm/build.sh b/crates/wasm/build.sh index 22814b74936..61b5b17d34d 100755 --- a/crates/wasm/build.sh +++ b/crates/wasm/build.sh @@ -30,7 +30,7 @@ require_command wasm-opt self_path=$(dirname "$(readlink -f "$0")") export pname=$(toml2json < ${self_path}/Cargo.toml | jq -r .package.name) -export CARGO_TARGET_DIR=$self_path/target +export CARGO_TARGET_DIR=$self_path/../../target rm -rf $self_path/outputs >/dev/null 2>&1 rm -rf $self_path/result >/dev/null 2>&1 diff --git a/crates/wasm/buildPhaseCargoCommand.sh b/crates/wasm/buildPhaseCargoCommand.sh index 5fff9eff808..5ba924dbb7b 100755 --- a/crates/wasm/buildPhaseCargoCommand.sh +++ b/crates/wasm/buildPhaseCargoCommand.sh @@ -25,7 +25,7 @@ fi # TODO: Handle the wasm target being built in release mode TARGET=wasm32-unknown-unknown -WASM_BINARY=${self_path}/../../target/${TARGET}/release/${pname}.wasm +WASM_BINARY=${CARGO_TARGET_DIR}/${TARGET}/release/${pname}.wasm NODE_DIR=${self_path}/pkg/nodejs/ BROWSER_DIR=${self_path}/pkg/web/ diff --git a/flake.nix b/flake.nix index ea677501147..912b035d359 100644 --- a/flake.nix +++ b/flake.nix @@ -88,7 +88,7 @@ BARRETENBERG_BIN_DIR = "${pkgs.barretenberg-wasm}/bin"; }; - testEnvironment = sharedEnvironment // {}; + testEnvironment = sharedEnvironment // { }; # The `self.rev` property is only available when the working tree is not dirty GIT_COMMIT = if (self ? rev) then self.rev else "unknown"; @@ -295,6 +295,7 @@ COMMIT_SHORT = builtins.substring 0 7 GIT_COMMIT; VERSION_APPENDIX = if GIT_DIRTY == "true" then "-dirty" else ""; PKG_PATH = "./pkg"; + CARGO_TARGET_DIR = "./target"; nativeBuildInputs = with pkgs; [ which