diff options
| author | Albin <albin@mullvad.net> | 2026-04-21 17:42:02 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2026-04-21 17:42:02 +0200 |
| commit | b4f62373d06cb6d69f1d39fdae481b24c47f3f18 (patch) | |
| tree | 7d031048724b306ed0f0692fe97cc003fec00d15 | |
| parent | c99ee1427c63fb3017b12d52c69a92f444767e16 (diff) | |
| download | mullvadvpn-b4f62373d06cb6d69f1d39fdae481b24c47f3f18.tar.xz mullvadvpn-b4f62373d06cb6d69f1d39fdae481b24c47f3f18.zip | |
Add devshell support for parsing minor compile sdk
| -rw-r--r-- | nix/android-toolchain.nix | 5 |
1 files 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 |