From 30f518fa36be8378d86b28e8eab2433151fe616a Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Thu, 27 Feb 2025 11:35:14 +0200 Subject: chore: Nix fmt --- zkvms/risc0/default.nix | 55 ++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 35 deletions(-) (limited to 'zkvms/risc0') diff --git a/zkvms/risc0/default.nix b/zkvms/risc0/default.nix index 4227fc4..6a4b796 100644 --- a/zkvms/risc0/default.nix +++ b/zkvms/risc0/default.nix @@ -1,50 +1,35 @@ -{ zkvmLib, - stdenv, - lib, - metacraft-labs, - pkg-config, - craneLib-default, -}: +{ zkvmLib, stdenv, lib, metacraft-labs, pkg-config, craneLib-default, }: let commonArgs = { pname = "risc0"; inherit (metacraft-labs.risc0) version; - src = with lib.fileset; toSource { - root = ../..; - fileset = intersection (gitTracked ../..) (unions [ - ./. - ../../guests - ../../guests_macro - ../../zkvms_host_io - ]); - }; + src = with lib.fileset; + toSource { + root = ../..; + fileset = intersection (gitTracked ../..) + (unions [ ./. ../../guests ../../guests_macro ../../zkvms_host_io ]); + }; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.risc0; cargoArtifacts = zkvmLib.buildDepsOnly craneLib commonArgs; -in - zkvmLib.buildPackage craneLib (commonArgs - // { - inherit cargoArtifacts; +in zkvmLib.buildPackage craneLib (commonArgs // { + inherit cargoArtifacts; - nativeBuildInputs = [ - metacraft-labs.risc0 - ]; + nativeBuildInputs = [ metacraft-labs.risc0 ]; - guestToolchain = metacraft-labs.risc0-rust; + guestToolchain = metacraft-labs.risc0-rust; - guestTarget = "riscv32im-risc0-zkvm-elf"; + guestTarget = "riscv32im-risc0-zkvm-elf"; - preBuild = '' - # Used for verification - # https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L192-L195 - export GUEST_ID="$(${metacraft-labs.risc0}/bin/r0vm --elf ./host/src/guest --id)" - ''; + preBuild = '' + # Used for verification + # https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L192-L195 + export GUEST_ID="$(${metacraft-labs.risc0}/bin/r0vm --elf ./host/src/guest --id)" + ''; - preRunBinaries = [ - metacraft-labs.risc0 - ]; + preRunBinaries = [ metacraft-labs.risc0 ]; - doCheck = false; - }) + doCheck = false; +}) -- cgit v1.2.3