From 32ac732b7d219c849d8837bbf58c76aabe0df71f Mon Sep 17 00:00:00 2001
From: vicrodh <103399283+vicrodh@users.noreply.github.com>
Date: Mon, 12 Jan 2026 12:40:03 -0600
Subject: [PATCH] fix(flatpak): use rustup to install latest Rust in SDK 23.08

SDK 24.08 doesn't have javascriptcoregtk-4.1 (uses webkit 6.0).
SDK 23.08 has Rust 1.81 which doesn't support edition2024.
Solution: use SDK 23.08 with webkit2gtk 4.1 but install Rust via rustup.
---
 .github/workflows/release-flatpak.yml      |  7 +++----
 packaging/flatpak/com.blitzkriegfc.qbz.yml | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-flatpak.yml b/.github/workflows/release-flatpak.yml
index 52c839b3a..a119ad4ba 100644
--- a/.github/workflows/release-flatpak.yml
+++ b/.github/workflows/release-flatpak.yml
@@ -77,10 +77,9 @@ jobs:
       - name: Install runtimes
         run: |
           flatpak --user install -y --noninteractive flathub \
-            org.freedesktop.Platform//24.08 \
-            org.freedesktop.Sdk//24.08 \
-            org.freedesktop.Sdk.Extension.node22//24.08 \
-            org.freedesktop.Sdk.Extension.rust-stable//24.08
+            org.freedesktop.Platform//23.08 \
+            org.freedesktop.Sdk//23.08 \
+            org.freedesktop.Sdk.Extension.node20//23.08
 
       - name: Build Flatpak
         env:
diff --git a/packaging/flatpak/com.blitzkriegfc.qbz.yml b/packaging/flatpak/com.blitzkriegfc.qbz.yml
index 4e1939cdd..65f09eed9 100644
--- a/packaging/flatpak/com.blitzkriegfc.qbz.yml
+++ b/packaging/flatpak/com.blitzkriegfc.qbz.yml
@@ -1,10 +1,9 @@
 app-id: com.blitzkriegfc.qbz
 runtime: org.freedesktop.Platform
-runtime-version: '24.08'
+runtime-version: '23.08'
 sdk: org.freedesktop.Sdk
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.node22
-  - org.freedesktop.Sdk.Extension.rust-stable
+  - org.freedesktop.Sdk.Extension.node20
 command: qbz
 finish-args:
   - --share=ipc
@@ -24,13 +23,18 @@ modules:
   - name: qbz
     buildsystem: simple
     build-options:
-      append-path: /usr/lib/sdk/node22/bin:/usr/lib/sdk/rust-stable/bin
+      append-path: /usr/lib/sdk/node20/bin
+      env:
+        CARGO_HOME: /run/build/qbz/.cargo
+        RUSTUP_HOME: /run/build/qbz/.rustup
       build-args:
         - --share=network
     build-commands:
-      - npm ci
-      - npm run build
-      - cd src-tauri && cargo build --release
+      # Install rustup and latest stable Rust (for edition2024 support)
+      - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal
+      - . "$CARGO_HOME/env" && npm ci
+      - . "$CARGO_HOME/env" && npm run build
+      - . "$CARGO_HOME/env" && cd src-tauri && cargo build --release
       - install -Dm755 src-tauri/target/release/qbz-nix /app/bin/qbz
       - install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.desktop /app/share/applications/com.blitzkriegfc.qbz.desktop
       - install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.metainfo.xml /app/share/metainfo/com.blitzkriegfc.qbz.metainfo.xml