From b0608ca2c0d8f739bead99eb93adc520ce2e1df1 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Tue, 21 Jan 2025 17:31:02 +0200
Subject: feat(flake): Rework withCustomPhases variables

---
 zkvms/jolt/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'zkvms/jolt/default.nix')

diff --git a/zkvms/jolt/default.nix b/zkvms/jolt/default.nix
index 2c6399c..d0c6775 100644
--- a/zkvms/jolt/default.nix
+++ b/zkvms/jolt/default.nix
@@ -49,23 +49,21 @@ in
         sed -i '/guest\/guests/d' ./zkvms/jolt/Cargo.toml
       '';
 
-      hostBin = "host-jolt";
       guestTarget = "riscv32im-jolt-zkvm-elf";
-      extraGuestArgs = "--features guest";
+      guestExtraArgs = "--features guest";
 
       preBuildGuest = ''
-        export RUSTUP_TOOLCHAIN="x"
-        export RUSTFLAGS="-C link-arg=-T${./guest/guest.ld} -C passes=lower-atomic -C panic=abort -C strip=symbols -C opt-level=z"
+        RUSTUP_TOOLCHAIN="x"
+        RUSTFLAGS="-C link-arg=-T${./guest/guest.ld} -C passes=lower-atomic -C panic=abort -C strip=symbols -C opt-level=z"
+        export RUSTUP_TOOLCHAIN RUSTFLAGS
       '';
 
-      preBuild = ''
-        unset RUSTUP_TOOLCHAIN
-        export RUSTFLAGS="-Z macro-backtrace"
-      '';
+      preRunBinaries = [
+        metacraft-labs.jolt
+      ];
 
       preRun = ''
         export ELF_PATH="$out/bin/guest"
-        export PATH="$PATH:${metacraft-labs.jolt}/bin"
       '';
 
       doCheck = false;
-- 
cgit v1.2.3