diff options
| -rw-r--r-- | zkvmLib.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/zkvmLib.nix b/zkvmLib.nix index c982e93..54a318f 100644 --- a/zkvmLib.nix +++ b/zkvmLib.nix @@ -106,14 +106,12 @@ in { pname = "${args.pname}_${guest}"; in craneLib.buildPackage ((generateCargoLocks craneLib args) // { phases = [ - "unpackPhase" # Standard phases - "linkGuest" # Custom phase - "patchPhase" "configurePhase" # Standard phases - "buildGuestPhase" # Custom phase + "unpackPhase" "patchPhase" "configurePhase" # Standard phases + "cargoSetupGuest" "buildGuestPhase" # Custom phases "buildPhase" "checkPhase" "installPhase" "fixupPhase" # Standard phases ]; - linkGuest = let + cargoSetupGuest = let appended = '' zkp = { path = "../../../guests/${guest}", package = "${guest}" } @@ -123,6 +121,11 @@ in { ''; in '' echo '${appended}' >> zkvms/${args.pname}/guest/Cargo.toml + pushd zkvms/${args.pname}/guest + + echo '${appended}' >> Cargo.toml + + popd ''; buildGuestPhase = '' |