From ea0c8145f31a19ce2d5a511dd639b9d463a5dd2b Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Tue, 9 Dec 2025 18:49:22 +0000
Subject: [PATCH] Update Nix flake

- sync the rust update
- remove gradle workaround now https://github.com/NixOS/nixpkgs/pull/449037 was merged
---
 flake.lock | 12 ++++++------
 flake.nix  | 15 +++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index d20462c..5a85df6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764667669,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+        "lastModified": 1765186076,
+        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
+        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764816035,
-        "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=",
+        "lastModified": 1765248027,
+        "narHash": "sha256-ngar+yP06x3+2k2Iey29uU0DWx5ur06h3iPBQXlU+yI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238",
+        "rev": "7b50ad68415ae5be7ee4cc68fa570c420741b644",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ae6c3af..c4d97b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
       };
 
       # Match app/src/main/rust/RUST_VERSION
-      rustToolchain = pkgs.rust-bin.stable."1.89.0".default.override {
+      rustToolchain = pkgs.rust-bin.stable."1.91.1".default.override {
         targets = [
           "aarch64-linux-android"
           "x86_64-linux-android"
@@ -72,13 +72,7 @@
         shellHook = ''
           build_tools_version="36.0.0"
           cmake_version="3.22.1"
-          sdk_root="${android.androidsdk}"
-          for candidate in "$sdk_root" "$sdk_root/share/android-sdk" "$sdk_root/libexec/android-sdk"; do
-            if [ -d "$candidate/platforms" ]; then
-              sdk_root="$candidate"
-              break
-            fi
-          done
+          sdk_root="${android.androidsdk}/libexec/android-sdk"
 
           export ANDROID_SDK_ROOT="$sdk_root"
           export ANDROID_HOME="$sdk_root"
@@ -94,10 +88,7 @@
           export AR_aarch64_linux_android="$NDK_PATH/llvm-ar"
 
           export PATH="$NDK_PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$build_tools_version:$ANDROID_SDK_ROOT/cmake/$cmake_version/bin:$PATH"
-
-          # FIXME: https://github.com/NixOS/nixpkgs/issues/402297
-          # export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/$build_tools_version/aapt2"
-          # Workaround with `-Dorg.gradle.project.android.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/36.0.0/aapt2`
+          export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/$build_tools_version/aapt2"
 
           echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
           echo "ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"