From ad08417e626b2e6e93d1f217012acd1dd77d495f Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Thu, 30 Jan 2025 12:18:36 +0200
Subject: feat(jolt): Adapt to new input type and zkvmLib

---
 zkvms/jolt/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'zkvms/jolt/default.nix')

diff --git a/zkvms/jolt/default.nix b/zkvms/jolt/default.nix
index e8614fe..1086cde 100644
--- a/zkvms/jolt/default.nix
+++ b/zkvms/jolt/default.nix
@@ -1,4 +1,4 @@
-{ zkVM-helpers,
+{ zkvmLib,
   stdenv,
   lib,
   just,
@@ -23,8 +23,6 @@ let
       ]);
     };
 
-    cargoLock = ./Cargo.lock;
-
     nativeBuildInputs = [
       metacraft-labs.jolt
       openssl
@@ -33,21 +31,16 @@ let
   };
 
   craneLib = craneLib-default.overrideToolchain metacraft-labs.jolt;
-  cargoArtifacts = craneLib.buildDepsOnly (zkVM-helpers.fixDeps (commonArgs // {
+  cargoArtifacts = zkvmLib.buildDepsOnly craneLib (commonArgs // {
     postConfigure = ''
-      sed -i 's/"guest",//' zkvms/jolt/Cargo.toml
       sed -i '/dependencies.guest/,+1d' zkvms/jolt/host/Cargo.toml
     '';
-  }));
+  });
 in
-  craneLib.buildPackage (zkVM-helpers.withCustomPhases (commonArgs
+  zkvmLib.buildPackage craneLib (commonArgs
     // {
       inherit cargoArtifacts;
 
-      postPatch = ''
-        sed -i '/guest\/guests/d' ./zkvms/jolt/Cargo.toml
-      '';
-
       guestTarget = "riscv32im-jolt-zkvm-elf";
       guestExtraArgs = "--features guest";
 
@@ -66,4 +59,4 @@ in
       '';
 
       doCheck = false;
-    }))
+    })
-- 
cgit v1.2.3