Holochain v0.4 working

darksoil-studio · Dec 19, 2024 · a9f7adb · a9f7adb
1 parent fbf9e37
commit a9f7adb
Show file tree

Hide file tree

Showing 17 changed files with 327 additions and 366 deletions.
diff --git a/crates/scaffold-holochain-runtime/default.nix b/crates/scaffold-holochain-runtime/default.nix
@@ -1,4 +1,4 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 
 {
   perSystem = { inputs', self', pkgs, system, lib, ... }: {
@@ -13,8 +13,9 @@
       crate = cargoToml.package.name;
 
       commonArgs = {
-        src = (self.lib.cleanScaffoldingSource { inherit lib; })
-          (craneLib.path ../../.);
+        src = (inputs.tnesh-stack.outputs.lib.cleanScaffoldingSource {
+          inherit lib;
+        }) (craneLib.path ../../.);
         doCheck = false;
         buildInputs = self'.dependencies.tauriHapp.buildInputs;
         nativeBuildInputs = self'.dependencies.tauriHapp.nativeBuildInputs;

diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 use tauri_plugin_holochain::{HolochainPluginConfig, HolochainExt, WANNetworkConfig, vec_to_locked};
 
 const SIGNAL_URL: &'static str = "wss://sbd.holo.host";
-const BOOTSTRAP_URL: &'static str = "https://bootstrap.holochain.org";
+const BOOTSTRAP_URL: &'static str = "https://bootstrap.holo.host";
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {

diff --git a/crates/scaffold-tauri-happ/default.nix b/crates/scaffold-tauri-happ/default.nix
@@ -1,4 +1,4 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 
 {
   perSystem = { inputs', self', pkgs, system, lib, ... }: {
@@ -13,8 +13,9 @@
       crate = cargoToml.package.name;
 
       commonArgs = {
-        src = (self.lib.cleanScaffoldingSource { inherit lib; })
-          (craneLib.path ../../.);
+        src = (inputs.tnesh-stack.outputs.lib.cleanScaffoldingSource {
+          inherit lib;
+        }) (craneLib.path ../../.);
         doCheck = false;
         buildInputs = self'.dependencies.tauriHapp.buildInputs;
         nativeBuildInputs = self'.dependencies.tauriHapp.nativeBuildInputs;

diff --git a/crates/tauri-plugin-holochain/src/lib.rs b/crates/tauri-plugin-holochain/src/lib.rs
@@ -34,7 +34,7 @@ pub struct HolochainPlugin<R: Runtime> {
 }
 
 fn happ_origin(app_id: &String) -> String {
-    if cfg!(target_os = "windows") {
+    if cfg!(any(target_os = "windows", target_os = "android")) {
         format!("http://happ.{app_id}")
     } else {
         format!("happ://{app_id}")