From 6d44c918094fd5c93aed4ca7e87ea42317d28e3b Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Thu, 30 Jan 2025 11:17:02 +0200
Subject: feat(zkvmLib): Make package names depend on guest

---
 zkvmLib.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/zkvmLib.nix b/zkvmLib.nix
index 15af3f2..5bdd890 100644
--- a/zkvmLib.nix
+++ b/zkvmLib.nix
@@ -39,9 +39,13 @@ in {
         cd zkvms/${args.pname}/guest
         cargo check --release --offline --all-targets
       '';
+  } // {
+    pname = "${args.pname}_${guest}";
   });
 
-  buildPackage = craneLib: args: craneLib.buildPackage ((generateCargoLocks craneLib args) // {
+  buildPackage = craneLib: args: let
+    pname = "${args.pname}_${guest}";
+  in craneLib.buildPackage ((generateCargoLocks craneLib args) // {
     phases = [
       "unpackPhase" # Standard phases
       "linkGuest" # Custom phase
@@ -101,18 +105,18 @@ in {
         mv "$bin" "$out"/bin/
       done
 
-      cat <<EOF > "$out"/bin/${args.pname}
+      cat <<EOF > "$out"/bin/${pname}
       #!/usr/bin/env sh
       ${preRunBinaries}
       ${preRunLibraries}
       ${args.preRun or ""}
       "$out"/bin/host-${args.pname} \$@
       EOF
-      chmod +x "$out"/bin/${args.pname}
+      chmod +x "$out"/bin/${pname}
 
       runHook postInstall
     '';
 
     doNotPostBuildInstallCargoBinaries = true;
-  } // args);
+  } // args // { inherit pname; });
 }
-- 
cgit v1.2.3