diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 44013a7e..948e1646 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Install Tauri CLI
         run: |
           if ! command -v cargo-tauri &> /dev/null; then
-            cargo install tauri-cli
+            CARGO_CFG_TARGET_OS=linux cargo install tauri-cli
           else
             echo "Tauri CLI already installed"
           fi
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index d539391e..940e6a8d 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -127,6 +127,8 @@ jobs:
 
       - name: Install Tauri CLI
         run: cargo install tauri-cli
+        env:
+          CARGO_CFG_TARGET_OS: linux
 
       - name: Build Tauri App (Linux)
         working-directory: ./frontend
diff --git a/.github/workflows/mobile-build.yml b/.github/workflows/mobile-build.yml
index 48aa3827..0c81d3cc 100644
--- a/.github/workflows/mobile-build.yml
+++ b/.github/workflows/mobile-build.yml
@@ -43,6 +43,10 @@ jobs:
 
       - name: Install Tauri CLI
         run: cargo install tauri-cli
+        env:
+          # Workaround for getrandom v0.2.16 (https://github.com/rust-random/getrandom/issues/641)
+          # cargo install builds for the host; on macOS runners target_os is "macos"
+          CARGO_CFG_TARGET_OS: macos
 
       - name: Set up API Key
         run: |
diff --git a/.github/workflows/testflight-on-comment.yml b/.github/workflows/testflight-on-comment.yml
index 41987946..5db263af 100644
--- a/.github/workflows/testflight-on-comment.yml
+++ b/.github/workflows/testflight-on-comment.yml
@@ -101,6 +101,10 @@ jobs:
 
       - name: Install Tauri CLI
         run: cargo install tauri-cli
+        env:
+          # Workaround for getrandom v0.2.16 (https://github.com/rust-random/getrandom/issues/641)
+          # cargo install builds for the host; on macOS runners target_os is "macos"
+          CARGO_CFG_TARGET_OS: macos
 
       - name: Set up API Key
         run: |
diff --git a/flake.nix b/flake.nix
index 999344a8..16ed8dbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
         };
         
         # Use specific rust version required by Tauri
-        rustToolchain = pkgs.rust-bin.stable."1.78.0".default.override {
+        rustToolchain = pkgs.rust-bin.stable."1.85.0".default.override {
           extensions = [ "rust-src" ];
         };
       in