feat(packages/risc0): Update

Author: reo101

packages/risc0/default.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   risc0-rust,
   rustFromToolchainFile,
   craneLib,
@@ -56,20 +57,34 @@ in
 crane.buildPackage (
   commonArgs
   // (installSourceAndCargo rust-toolchain)
-  // rec {
+  // {
     inherit cargoArtifacts;
 
-    postPatch = ''
-      # Replace usages of `Command::new("rustup")` with the correct value
-      # which should be used
-      sed -i '27d;28iPathBuf::from(r"${risc0-rust}")' rzup/src/paths.rs
+    # NOTE: leave ability to change comments without modifying the bash code, avoiding unneeded rebuilds
+    postPatch = lib.concatStringsSep "\n" [
+      # Replace references to the normal installations of `rustup` and `risc0`
+      # As per <https://github.com/risc0/risc0/blob/14b5d588dd01cf4f7ba804d8bb0a61264e6ae2c6/rzup/src/env.rs#L213>,
+      # used in places like <https://github.com/risc0/risc0/blob/14b5d588dd01cf4f7ba804d8bb0a61264e6ae2c6/rzup/src/components.rs#L139>
+      /* bash */
+      ''
+        RISC0_PATHBUF='PathBuf::from(r#"'"${risc0-rust}"'"#)'
+        sed -i \
+            -e '215s|home_dir.join(".risc0")|'"$RISC0_PATHBUF"'|' \
+            -e '219s|home_dir.join(".rustup")|'"$RISC0_PATHBUF"'|' \
+            ./rzup/src/env.rs
+      ''
+
       # Fix starter template
-      sed -i 's|{{ risc0_build }}|path = "'$out'"|' risc0/cargo-risczero/templates/rust-starter/methods/Cargo-toml
-      sed -i 's|{{ risc0_zkvm }}|path = "'$out'"|' risc0/cargo-risczero/templates/rust-starter/host/Cargo-toml
-    '';
+      /* bash */
+      ''
+        sed -i 's|{{ risc0_build }}|path = "'$out'"|' ./risc0/cargo-risczero/templates/rust-starter/methods/Cargo-toml
+        sed -i 's|{{ risc0_zkvm }}|path = "'$out'"|' ./risc0/cargo-risczero/templates/rust-starter/host/Cargo-toml
+      ''
+    ];
 
     preBuild = ''
-      export RECURSION_SRC_PATH="${recursion-zkr}" RUSTFLAGS="$RUSTFLAGS -A dead_code"
+      export RECURSION_SRC_PATH="${recursion-zkr}"
+      export RUSTFLAGS="$RUSTFLAGS -A dead_code"
     '';
 
     cargoBuildCommand = "cargo build --release -p risc0-zkvm -p risc0-build -p cargo-risczero --features unstable";