diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-02-27 11:35:14 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-02-27 15:08:11 +0200 |
| commit | 39ec264c0d90555237debff519cc890b755a0646 (patch) | |
| tree | 09a9602f5637804fa7bd876fcd971ecb9d0afffe /zkvms/jolt | |
| parent | 3b037df28ccdd905db1e2668b68e78fe07ef6eee (diff) | |
| download | zkVMs-benchmarks-39ec264c0d90555237debff519cc890b755a0646.tar zkVMs-benchmarks-39ec264c0d90555237debff519cc890b755a0646.tar.gz zkVMs-benchmarks-39ec264c0d90555237debff519cc890b755a0646.zip | |
chore: Nix fmt
Diffstat (limited to 'zkvms/jolt')
| -rw-r--r-- | zkvms/jolt/default.nix | 80 |
1 files changed, 32 insertions, 48 deletions
diff --git a/zkvms/jolt/default.nix b/zkvms/jolt/default.nix index 2e1ad9c..e749ac4 100644 --- a/zkvms/jolt/default.nix +++ b/zkvms/jolt/default.nix @@ -1,32 +1,18 @@ -{ zkvmLib, - stdenv, - lib, - just, - metacraft-labs, - pkg-config, - openssl, - craneLib-default, -}: +{ zkvmLib, stdenv, lib, just, metacraft-labs, pkg-config, openssl +, craneLib-default, }: let commonArgs = { pname = "jolt"; inherit (metacraft-labs.jolt) version; - src = with lib.fileset; toSource { - root = ../..; - fileset = intersection (gitTracked ../..) (unions [ - ./. - ../../guests - ../../guests_macro - ../../zkvms_host_io - ]); - }; - - nativeBuildInputs = [ - metacraft-labs.jolt - openssl - pkg-config - ]; + src = with lib.fileset; + toSource { + root = ../..; + fileset = intersection (gitTracked ../..) + (unions [ ./. ../../guests ../../guests_macro ../../zkvms_host_io ]); + }; + + nativeBuildInputs = [ metacraft-labs.jolt openssl pkg-config ]; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.jolt; @@ -35,27 +21,25 @@ let sed -i '/dependencies.guest/,+1d' zkvms/jolt/host/Cargo.toml ''; }); -in - zkvmLib.buildPackage craneLib (commonArgs - // { - inherit cargoArtifacts; - - guestTarget = "riscv32im-jolt-zkvm-elf"; - guestExtraArgs = "--features guest"; - - preBuildGuest = '' - RUSTUP_TOOLCHAIN="x" - RUSTFLAGS="-C link-arg=-T${./guest/guest.ld} -C passes=lower-atomic -C panic=abort -C strip=symbols -C opt-level=z" - export RUSTUP_TOOLCHAIN RUSTFLAGS - ''; - - preRunBinaries = [ - metacraft-labs.jolt - ]; - - preRun = '' - export ELF_PATH="$out/bin/guest" - ''; - - doCheck = false; - }) +in zkvmLib.buildPackage craneLib (commonArgs // { + inherit cargoArtifacts; + + guestTarget = "riscv32im-jolt-zkvm-elf"; + guestExtraArgs = "--features guest"; + + preBuildGuest = '' + RUSTUP_TOOLCHAIN="x" + RUSTFLAGS="-C link-arg=-T${ + ./guest/guest.ld + } -C passes=lower-atomic -C panic=abort -C strip=symbols -C opt-level=z" + export RUSTUP_TOOLCHAIN RUSTFLAGS + ''; + + preRunBinaries = [ metacraft-labs.jolt ]; + + preRun = '' + export ELF_PATH="$out/bin/guest" + ''; + + doCheck = false; +}) |