Better OSD behavior, lots of build stuff

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 9 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index 83361d2..842bb7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -466,26 +466,23 @@
       };
 
       android = with pkgs; let
-        cmakeVersion = "3.22.1";
+        cmakeVersion = "4.1.2";
         androidComposition = androidenv.composeAndroidPackages {
-          cmdLineToolsVersion = "19.0";
+          cmdLineToolsVersion = "22.0";
           toolsVersion = "26.1.1";
           platformToolsVersion = "37.0.1";
-          buildToolsVersions = [ "36.1.0" ];
-          includeEmulator = false;
-          emulatorVersion = "35.2.5";
-          platformVersions = [ "34" ];
-          includeSources = false;
-          includeSystemImages = false;
-          systemImageTypes = [ "google_apis_playstore" ];
+          buildToolsVersions = [ "37.0.0" ];
+          platformVersions = [ "37.1" ];
           abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
           cmakeVersions = [ cmakeVersion ];
-          includeNDK = true;
-          # latest = 28.0.13004108, _counted_by conflict.
           ndkVersion = "29.0.14206865";
+          includeNDK = true;
+          includeEmulator = false;
+          includeSources = false;
+          includeSystemImages = false;
+          includeExtras = [ "extras;google;gcm" ];
           useGoogleAPIs = false;
           useGoogleTVAddOns = false;
-          includeExtras = [ "extras;google;gcm" ];
         };
       in pkgs.mkShell rec {
         NIX_HARDENING_ENABLE = "";