diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-02-17 16:32:29 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-02-18 14:26:14 +0200 |
| commit | 0e0404c856c07a6b3b6d957e5a27d9af380682e6 (patch) | |
| tree | ff1712e6ec954485cac5de813eae483416ae3973 | |
| parent | 99a6c880ec9f250f9b319a071635c38dc26e57e4 (diff) | |
| download | zkVMs-benchmarks-0e0404c856c07a6b3b6d957e5a27d9af380682e6.tar zkVMs-benchmarks-0e0404c856c07a6b3b6d957e5a27d9af380682e6.tar.gz zkVMs-benchmarks-0e0404c856c07a6b3b6d957e5a27d9af380682e6.zip | |
feat(zkvmLib): Use generated Cargo.lock in guest phases and add guest dep properly
Adding the zkp dependency with a command allows us to ignore the
package's original name
| -rw-r--r-- | zkvmLib.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zkvmLib.nix b/zkvmLib.nix index 54a318f..32fe772 100644 --- a/zkvmLib.nix +++ b/zkvmLib.nix @@ -104,7 +104,8 @@ in { buildPackage = craneLib: args: let pname = "${args.pname}_${guest}"; - in craneLib.buildPackage ((generateCargoLocks craneLib args) // { + cargoLocks = generateCargoLocks craneLib args; + in craneLib.buildPackage (cargoLocks // { phases = [ "unpackPhase" "patchPhase" "configurePhase" # Standard phases "cargoSetupGuest" "buildGuestPhase" # Custom phases @@ -113,16 +114,15 @@ in { cargoSetupGuest = let appended = '' - zkp = { path = "../../../guests/${guest}", package = "${guest}" } - [features] guest = [] # Only used in jolt no_std = ["zkp/no_std"] ''; in '' - echo '${appended}' >> zkvms/${args.pname}/guest/Cargo.toml pushd zkvms/${args.pname}/guest + cp '${cargoLocks.cargoLockDrv}/Cargo.lock' Cargo.lock + cargo add --path "../../../guests/${guest}" --rename zkp --offline echo '${appended}' >> Cargo.toml popd |