From b0608ca2c0d8f739bead99eb93adc520ce2e1df1 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Tue, 21 Jan 2025 17:31:02 +0200 Subject: feat(flake): Rework withCustomPhases variables --- zkvms/zkwasm/default.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'zkvms/zkwasm') diff --git a/zkvms/zkwasm/default.nix b/zkvms/zkwasm/default.nix index 4f4e42f..36c058e 100644 --- a/zkvms/zkwasm/default.nix +++ b/zkvms/zkwasm/default.nix @@ -48,30 +48,25 @@ in ln -s ../../../Cargo.lock ./zkvms/zkwasm/guest/ ''; - hostBin = "host-zkwasm"; - - buildGuestPhase = '' - pushd guest - + preBuildGuest = '' # Workaround from # https://github.com/rustwasm/wasm-pack/issues/1335 export WASM_PACK_CACHE=.wasm-pack-cache - - wasm-pack build --release --frozen - popd ''; - postInstall = '' - mv zkvms/zkwasm/guest/pkg "$out"/ - ''; + buildGuestCommand = "wasm-pack build --release --frozen"; preBuild = '' export GUEST_PATH="$out/pkg/guest_bg.wasm" ''; - preRun = '' - export PATH="\$PATH:${metacraft-labs.zkwasm}/bin" + postInstall = '' + mv zkvms/zkwasm/guest/pkg "$out"/ ''; + preRunBinaries = [ + metacraft-labs.zkwasm + ]; + doCheck = false; })) -- cgit v1.2.3