From b4f62373d06cb6d69f1d39fdae481b24c47f3f18 Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 21 Apr 2026 17:42:02 +0200 Subject: Add devshell support for parsing minor compile sdk --- nix/android-toolchain.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/android-toolchain.nix b/nix/android-toolchain.nix index de2deccefd..b1b19551c1 100644 --- a/nix/android-toolchain.nix +++ b/nix/android-toolchain.nix @@ -17,14 +17,15 @@ let versions ; - compileSdkVersion = versions."compile-sdk"; + compileSdkVersion = versions."compile-sdk-major"; + compileSdkMinorVersion = versions."compile-sdk-minor" or "0"; buildToolsVersion = versions."build-tools"; minSdkVersion = versions."min-sdk"; ndkVersion = versions.ndk; android-sdk = android-nixpkgs.sdk.${system} ( sdkPkgs: with sdkPkgs; [ - (builtins.getAttr "platforms-android-${compileSdkVersion}" sdkPkgs) + (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs) (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs) (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs) cmdline-tools-latest -- cgit v1.3-3-g829e