File tree Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Original file line number Diff line number Diff line change 201201 inherit corepack-shims ;
202202
203203 zkwasm = callPackage ./zkwasm/default.nix args-zkVM ;
204- jolt = callPackage ./jolt/default.nix args-zkVM ;
205204 jolt-guest-rust = callPackage ./jolt-guest-rust/default.nix args-zkVM-rust ;
205+ jolt = callPackage ./jolt/default.nix ( args-zkVM // { inherit jolt-guest-rust ; } ) ;
206206 zkm = callPackage ./zkm/default.nix args-zkVM ;
207207 nexus = callPackage ./nexus/default.nix args-zkVM ;
208208 sp1-rust = callPackage ./sp1-rust/default.nix args-zkVM-rust ;
Original file line number Diff line number Diff line change 55 installSourceAndCargo ,
66 pkg-config ,
77 openssl ,
8+ jolt-guest-rust ,
89 ...
910} :
1011let
4950 sed -i '44,46d' jolt-core/src/host/toolchain.rs
5051 '' ;
5152
53+ # Different toolchain is used when guest has std features
54+ # https://github.com/a16z/jolt/blob/fa45507aaddb1815bafd54332e4b14173a7f8699/jolt-core/src/host/mod.rs#L132-L134
55+ postInstall = ''
56+ rm $out/bin/rustc
57+ cat <<EOF > $out/bin/rustc
58+ #!/bin/sh
59+ if [ -z "\'' ${RUSTUP_TOOLCHAIN+x}" ]
60+ then
61+ ${ jolt-guest-rust } /rust/build/host/stage2/bin/rustc \$@
62+ else
63+ ${ rust-toolchain } /bin/rustc \$@
64+ fi
65+ EOF
66+ chmod +x $out/bin/rustc
67+ '' ;
68+
5269 doCheck = false ;
5370 } )
You can’t perform that action at this time.
0 commit comments