diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | zkvms/jolt/default.nix | 1 | ||||
| -rw-r--r-- | zkvms/nexus/default.nix | 4 | ||||
| -rw-r--r-- | zkvms/risc0/default.nix | 4 | ||||
| -rw-r--r-- | zkvms/sp1/default.nix | 4 | ||||
| -rw-r--r-- | zkvms/zkm/default.nix | 4 | ||||
| -rw-r--r-- | zkvms/zkwasm/default.nix | 1 |
7 files changed, 8 insertions, 19 deletions
@@ -48,13 +48,20 @@ # - guest crate is located at zkvms/pname/guest and is named "guest" withCustomPhases = guest: currentPackage: let hostBin = currentPackage.hostBin or ("host-" + currentPackage.pname); + zkpPath = "zkvms/${currentPackage.pname}/guest/src/zkp"; in with currentPackage; { phases = [ - "unpackPhase" "patchPhase" "configurePhase" # Standard phases + "unpackPhase" # Standard phases + "linkGuest" # Custom phase + "patchPhase" "configurePhase" # Standard phases "buildGuestPhase" # Custom phase "buildPhase" "checkPhase" "installPhase" "fixupPhase" # Standard phases ]; + linkGuest = '' + ln -s ../../../../guests/${guest} ./${zkpPath} + ''; + buildGuestPhase = '' pushd zkvms/${currentPackage.pname}/guest runHook preBuildGuest diff --git a/zkvms/jolt/default.nix b/zkvms/jolt/default.nix index d0c6775..e8614fe 100644 --- a/zkvms/jolt/default.nix +++ b/zkvms/jolt/default.nix @@ -45,7 +45,6 @@ in inherit cargoArtifacts; postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/jolt/guest/src/zkp sed -i '/guest\/guests/d' ./zkvms/jolt/Cargo.toml ''; diff --git a/zkvms/nexus/default.nix b/zkvms/nexus/default.nix index e68da62..7a706e9 100644 --- a/zkvms/nexus/default.nix +++ b/zkvms/nexus/default.nix @@ -39,10 +39,6 @@ in // rec { inherit cargoArtifacts; - postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/nexus/guest/src/zkp - ''; - preBuildGuest = '' export RUSTFLAGS="-C link-arg=-T${guest/guest.ld}" ''; diff --git a/zkvms/risc0/default.nix b/zkvms/risc0/default.nix index 2a80ece..a072404 100644 --- a/zkvms/risc0/default.nix +++ b/zkvms/risc0/default.nix @@ -36,10 +36,6 @@ in metacraft-labs.risc0 ]; - postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/risc0/guest/src/zkp - ''; - guestTarget = "riscv32im-risc0-zkvm-elf"; preBuild = '' diff --git a/zkvms/sp1/default.nix b/zkvms/sp1/default.nix index 2ab3afa..a57afbe 100644 --- a/zkvms/sp1/default.nix +++ b/zkvms/sp1/default.nix @@ -36,10 +36,6 @@ in metacraft-labs.sp1 ]; - postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/sp1/guest/src/zkp - ''; - guestTarget = "riscv32im-succinct-zkvm-elf"; doCheck = false; diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix index 92abdbf..51adfd6 100644 --- a/zkvms/zkm/default.nix +++ b/zkvms/zkm/default.nix @@ -59,10 +59,6 @@ in // { inherit cargoArtifacts; - postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/zkm/guest/src/zkp - ''; - guestTarget = "mips-zkm-zkvm-elf"; preBuildGuest = '' diff --git a/zkvms/zkwasm/default.nix b/zkvms/zkwasm/default.nix index 36c058e..86d4687 100644 --- a/zkvms/zkwasm/default.nix +++ b/zkvms/zkwasm/default.nix @@ -44,7 +44,6 @@ in ]; postPatch = '' - ln -s ../../../../guests/graph_coloring ./zkvms/zkwasm/guest/src/zkp ln -s ../../../Cargo.lock ./zkvms/zkwasm/guest/ ''; |