diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-01-14 14:18:45 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-01-14 16:39:30 +0200 |
| commit | 5e9c547275b23ae6117375f9472d6d109f90625b (patch) | |
| tree | 441efb960c4ed99932f8a05e3680027d170c9b28 /zkvms | |
| parent | 4e8e7fdece91540ca9b521012373660e3dea73dd (diff) | |
| download | zkVMs-benchmarks-5e9c547275b23ae6117375f9472d6d109f90625b.tar zkVMs-benchmarks-5e9c547275b23ae6117375f9472d6d109f90625b.tar.gz zkVMs-benchmarks-5e9c547275b23ae6117375f9472d6d109f90625b.zip | |
feat(flake): Introduce custom buildGuestPhase
Diffstat (limited to 'zkvms')
| -rw-r--r-- | zkvms/risc0/default.nix | 8 | ||||
| -rw-r--r-- | zkvms/sp1/default.nix | 12 |
2 files changed, 3 insertions, 17 deletions
diff --git a/zkvms/risc0/default.nix b/zkvms/risc0/default.nix index e465a4b..f9b5dac 100644 --- a/zkvms/risc0/default.nix +++ b/zkvms/risc0/default.nix @@ -40,17 +40,13 @@ in ''; preBuild = '' - pushd ./guest - cargo build --release --target riscv32im-risc0-zkvm-elf - ln -s ../../../../zkvms/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/guest ../host/src/guest - popd - # Used for verification # https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L192-L195 - export GUEST_ID="$(${metacraft-labs.risc0}/bin/r0vm --elf ../host/src/guest --id)" + export GUEST_ID="$(${metacraft-labs.risc0}/bin/r0vm --elf ./host/src/guest --id)" ''; hostBin = "host-risc0"; + guestTarget = "riscv32im-risc0-zkvm-elf"; preRun = '' export PATH="\$PATH:${metacraft-labs.risc0}/bin" diff --git a/zkvms/sp1/default.nix b/zkvms/sp1/default.nix index 47d94f1..6baee1f 100644 --- a/zkvms/sp1/default.nix +++ b/zkvms/sp1/default.nix @@ -22,10 +22,6 @@ let }; cargoLock = ./Cargo.lock; - - preBuild = '' - cd zkvms/sp1 - ''; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.sp1; @@ -43,14 +39,8 @@ in ln -s ../../../../guests/graph_coloring ./zkvms/sp1/guest/src/zkp ''; - preBuild = '' - pushd ./guest - cargo build --release --target riscv32im-succinct-zkvm-elf - ln -s ../../../../zkvms/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/guest ../host/src/guest - popd - ''; - hostBin = "host-sp1"; + guestTarget = "riscv32im-succinct-zkvm-elf"; doCheck = false; })) |