From 99a6c880ec9f250f9b319a071635c38dc26e57e4 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Mon, 17 Feb 2025 16:29:39 +0200
Subject: feat(zkvmLib): Reorganize and rename linkGuest phase

---
 zkvmLib.nix | 13 ++++++++-----
 1 file 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 = ''
-- 
cgit v1.2.3