From b0608ca2c0d8f739bead99eb93adc520ce2e1df1 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Tue, 21 Jan 2025 17:31:02 +0200 Subject: feat(flake): Rework withCustomPhases variables --- zkvms/nexus/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'zkvms/nexus') diff --git a/zkvms/nexus/default.nix b/zkvms/nexus/default.nix index 003edb7..e68da62 100644 --- a/zkvms/nexus/default.nix +++ b/zkvms/nexus/default.nix @@ -43,23 +43,20 @@ in ln -s ../../../../guests/graph_coloring ./zkvms/nexus/guest/src/zkp ''; - hostBin = "host-nexus"; - guestTarget = "riscv32i-unknown-none-elf"; - extraGuestArgs = "--features no_std -- -C link-arg=-T${guest/guest.ld}"; - - buildGuestPhase = '' - pushd guest + preBuildGuest = '' + export RUSTFLAGS="-C link-arg=-T${guest/guest.ld}" + ''; - cargo rustc --release --target ${guestTarget} ${extraGuestArgs} - ln -s ../../guest/target/${guestTarget}/release/guest ../host/src/guest + guestTarget = "riscv32i-unknown-none-elf"; + guestExtraArgs = "--features no_std"; - popd - ''; + preRunLibraries = [ + openssl + ]; preRun = '' export ELF_PATH="$out/bin/guest" export PKG_CONFIG_PATH='${openssl.dev}/lib/pkgconfig' # Dirty hack - export LD_LIBRARY_PATH='${lib.makeLibraryPath [ openssl ]}' ''; doCheck = false; -- cgit v1.2.3