1 files changed, 19 insertions, 4 deletions

diff --git a/flake.nix b/flake.nix
index a28d708..35d2a40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,22 +22,24 @@
 
     withZKVMPhases = currentPackage: with currentPackage; {
         buildPhase = ''
-          root_dir="$PWD"
+          export INPUTS="$PWD/Vertices-010.in"
+
+          pushd zkvms/${currentPackage.pname}
           runHook preBuild
-          cd "$root_dir"
 
-          export INPUTS="$PWD/Vertices-010.in"
           cargo build --bin ${hostBin} --release
 
           runHook postBuild
+          popd
         '';
 
         installPhase = ''
           runHook preInstall
 
           mkdir -p "$out"/bin
-          for bin in $(find . -type f -regex ".*release/[^/]*" -executable -print)
+          for bin in $(find . -type f -regex "./zkvms/.*release/[^/]*" -executable -print)
           do
+            echo "$bin"
             mv "$bin" "$out"/bin/
           done
 
@@ -54,9 +56,22 @@
         doNotPostBuildInstallCargoBinaries = true;
       } // currentPackage;
 
+    fixZKVMDeps = commonArgs: commonArgs // {
+        postUnpack = ''
+          ln -s ../../../guests ./source/zkvms/${commonArgs.pname}/guest/
+          ln -s ../../../guests_macro ./source/zkvms/${commonArgs.pname}/guest/
+          ln -s ../../Cargo.lock ./source/zkvms/${commonArgs.pname}/
+        '';
+
+        preBuild = ''
+          cd zkvms/${commonArgs.pname}
+        '';
+      };
+
     args-zkVM = {
       craneLib-default = crane.mkLib pkgs;
       inherit withZKVMPhases;
+      inherit fixZKVMDeps;
     };
   in {
     packages.${system}.risc0 = callPackage ./zkvms/risc0/default.nix args-zkVM;