From f2489959950b7d6c552c09beb26f5a28ece2836c Mon Sep 17 00:00:00 2001
From: randogoth <kflux@posteo.de>
Date: Wed, 14 Oct 2026 09:17:58 +0300
Subject: [PATCH] fix: set flutter+android PATH inline in build step, drop
 devbox

---
 .forgejo/workflows/release.yml | 17 +++++++++--------
 .github/workflows/release.yml  | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index b988be7..b9525b4 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -16,13 +16,6 @@ jobs:
           distribution: temurin
           java-version: "17"
 
-      - name: Set up Android SDK from nix store
-        run: |
-          ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1)
-          echo "ANDROID_HOME=$ANDROID_SDK" >> $GITHUB_ENV
-          echo "ANDROID_SDK_ROOT=$ANDROID_SDK" >> $GITHUB_ENV
-          echo "Android SDK: $ANDROID_SDK"
-
       - name: Extract version
         run: |
           VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //')
@@ -39,7 +32,15 @@ jobs:
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
           KEY_ALIAS:      ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD:   ${{ secrets.KEY_PASSWORD }}
-        run: devbox run -- flutter build apk --release --flavor prod
+        run: |
+          FLUTTER=$(find /nix/store -maxdepth 2 -name "flutter-wrapped-*-sdk-links" -type d 2>/dev/null | sort -V | tail -1)
+          ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1)
+          export PATH="${FLUTTER}/bin:$PATH"
+          export ANDROID_HOME="$ANDROID_SDK"
+          export ANDROID_SDK_ROOT="$ANDROID_SDK"
+          echo "Flutter:     $FLUTTER"
+          echo "Android SDK: $ANDROID_SDK"
+          flutter build apk --release --flavor prod
 
       - name: Create Forgejo Release and upload APK
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b988be7..b9525b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,13 +16,6 @@ jobs:
           distribution: temurin
           java-version: "17"
 
-      - name: Set up Android SDK from nix store
-        run: |
-          ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1)
-          echo "ANDROID_HOME=$ANDROID_SDK" >> $GITHUB_ENV
-          echo "ANDROID_SDK_ROOT=$ANDROID_SDK" >> $GITHUB_ENV
-          echo "Android SDK: $ANDROID_SDK"
-
       - name: Extract version
         run: |
           VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //')
@@ -39,7 +32,15 @@ jobs:
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
           KEY_ALIAS:      ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD:   ${{ secrets.KEY_PASSWORD }}
-        run: devbox run -- flutter build apk --release --flavor prod
+        run: |
+          FLUTTER=$(find /nix/store -maxdepth 2 -name "flutter-wrapped-*-sdk-links" -type d 2>/dev/null | sort -V | tail -1)
+          ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1)
+          export PATH="${FLUTTER}/bin:$PATH"
+          export ANDROID_HOME="$ANDROID_SDK"
+          export ANDROID_SDK_ROOT="$ANDROID_SDK"
+          echo "Flutter:     $FLUTTER"
+          echo "Android SDK: $ANDROID_SDK"
+          flutter build apk --release --flavor prod
 
       - name: Create Forgejo Release and upload APK
         env: