diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-01-14 13:10:25 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-01-14 13:10:25 +0200 |
| commit | 7bdd131420125285b6dc61b1d7f505b0d4b15537 (patch) | |
| tree | 59c528f236981f4246ec90e928507a886ecdc0b7 /zkvms/risc0 | |
| parent | 17829ad872ce7ee5563465b952f939b388dd4f1b (diff) | |
| download | zkVMs-benchmarks-7bdd131420125285b6dc61b1d7f505b0d4b15537.tar zkVMs-benchmarks-7bdd131420125285b6dc61b1d7f505b0d4b15537.tar.gz zkVMs-benchmarks-7bdd131420125285b6dc61b1d7f505b0d4b15537.zip | |
feat: Rework usage of zkVM helper functions
Diffstat (limited to 'zkvms/risc0')
| -rw-r--r-- | zkvms/risc0/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
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; |