Website Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit99a6c880ec9f250f9b319a071635c38dc26e57e4 (patch)
Author
 Kamen Mladenov <kamen@syndamia.com>
2025-02-17 16:29:39 +0200
Committer
 Kamen Mladenov <kamen@syndamia.com>
2025-02-18 14:26:14 +0200
Files18958d9d2337cb97dcb681d0d6b205763aaba5e4
zkVMs-benchmarks-99a6c880ec9f250f9b319a071635c38dc26e57e4.tar
zkVMs-benchmarks-99a6c880ec9f250f9b319a071635c38dc26e57e4.tar.gz
zkVMs-benchmarks-99a6c880ec9f250f9b319a071635c38dc26e57e4.zip
Parentf2ce346679a6237499d0a40ecf871130d2c34e95 (diff)
feat(zkvmLib): Reorganize and rename linkGuest phase
1 files changed, 8 insertions, 5 deletions
-rw-r--r--zkvmLib.nix13
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 = ''