From 7bdd131420125285b6dc61b1d7f505b0d4b15537 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Tue, 14 Jan 2025 13:10:25 +0200
Subject: feat: Rework usage of zkVM helper functions

---
 zkvms/risc0/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/zkvms/risc0/default.nix b/zkvms/risc0/default.nix
index 5444eb6..e465a4b 100644
--- a/zkvms/risc0/default.nix
+++ b/zkvms/risc0/default.nix
@@ -1,22 +1,19 @@
-{ stdenv,
+{ zkVM-helpers,
+  stdenv,
   lib,
   just,
   metacraft-labs,
   pkg-config,
   craneLib-default,
-  withZKVMPhases,
-  fixZKVMDeps,
 }:
 let
-  fs = lib.fileset;
-
-  commonArgs = rec {
+  commonArgs = {
     pname = "risc0";
     version = "infdev";
 
-    src = fs.toSource {
+    src = with lib.fileset; toSource {
       root = ../..;
-      fileset = fs.intersection (fs.gitTracked ../..) (fs.unions [
+      fileset = intersection (gitTracked ../..) (unions [
           ./.
           ../../guests
           ../../guests_macro
@@ -28,9 +25,9 @@ let
   };
 
   craneLib = craneLib-default.overrideToolchain metacraft-labs.risc0;
-  cargoArtifacts = craneLib.buildDepsOnly (fixZKVMDeps commonArgs);
+  cargoArtifacts = craneLib.buildDepsOnly (zkVM-helpers.fixDeps commonArgs);
 in
-  craneLib.buildPackage (withZKVMPhases (commonArgs
+  craneLib.buildPackage (zkVM-helpers.withCustomPhases (commonArgs
     // {
       inherit cargoArtifacts;
 
-- 
cgit v1.2.3