From b0608ca2c0d8f739bead99eb93adc520ce2e1df1 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Tue, 21 Jan 2025 17:31:02 +0200
Subject: feat(flake): Rework withCustomPhases variables

---
 zkvms/zkm/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'zkvms/zkm')

diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix
index da7224b..92abdbf 100644
--- a/zkvms/zkm/default.nix
+++ b/zkvms/zkm/default.nix
@@ -63,7 +63,6 @@ in
         ln -s ../../../../guests/graph_coloring ./zkvms/zkm/guest/src/zkp
       '';
 
-      hostBin = "host-zkm";
       guestTarget = "mips-zkm-zkvm-elf";
 
       preBuildGuest = ''
@@ -71,18 +70,18 @@ in
         export RUSTFLAGS="-C target-cpu=mips2 -C target-feature=+crt-static -C link-arg=-nostdlib -C link-arg=-g -C link-arg=--entry=main"
       '';
 
-      postBuildGuest = ''
-        unset RUSTFLAGS
-      '';
-
       preBuild = ''
-        export RUSTFLAGS="-L ${zkm_libsnark}/lib $RUSTFLAGS"
+        export RUSTFLAGS="-L ${zkm_libsnark}/lib"
       '';
 
+      preRunLibraries = [
+        openssl
+        zkm_libsnark
+      ];
+
       preRun = ''
         export ELF_PATH="$out/bin/guest"
         export PKG_CONFIG_PATH='${openssl.dev}/lib/pkgconfig' # Dirty hack
-        export LD_LIBRARY_PATH='${lib.makeLibraryPath [ openssl zkm_libsnark ]}'
       '';
 
       doCheck = false;
-- 
cgit v1.2.3