diff --git a/android.nix b/android.nix index 982c65f3c2775b06e79a00bb5b7a5b4c323bafc0..8d386ec289dde3b65dac9464f8300e6dec04d626 100644 --- a/android.nix +++ b/android.nix @@ -1,4 +1,4 @@ -{ androidenv, cmakeVersion, buildToolsVersion, ndkVersion }: +{ androidenv, cmakeVersion, buildToolsVersion, platformVersion, ndkVersion }: let androidComposition = androidenv.composeAndroidPackages { toolsVersion = "26.1.1"; @@ -6,7 +6,7 @@ let buildToolsVersions = [ buildToolsVersion ]; includeEmulator = false; emulatorVersion = "30.3.4"; - platformVersions = [ "31" ]; + platformVersions = [ platformVersion ]; includeSources = false; includeSystemImages = false; systemImageTypes = [ "google_apis_playstore" ]; diff --git a/flake.nix b/flake.nix index 101a6caa310a4cf77361db48269f7ce2dcbaa1f0..81dcb89e5da313551a3998f4beff0882b6821281 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,7 @@ # platforms;android-32 Android SDK Platform 32 # The SDK directory is not writable (/nix/store/46214a16f22rd7q8vkrhsa907ra0405l-androidsdk/libexec/android-sdk) + platformVersion = "31"; cmakeVersion = "3.10.2"; buildToolsVersion = "31.0.0"; # Check out pkgs/development/mobile/androidenv/repo.json for @@ -84,7 +85,7 @@ # Also includes ndk androidComposition = pkgs.callPackage ./android.nix { - inherit cmakeVersion buildToolsVersion ndkVersion; + inherit cmakeVersion buildToolsVersion platformVersion ndkVersion; }; getBuildInputs = getInputs: xs: builtins.foldl' (accum: drv: (getInputs drv) ++ accum) [] xs; @@ -116,7 +117,7 @@ src = ./app; release = false; - platformVersions = [ "31" ]; + platformVersions = [ platformVersion ]; includeNDK = false; }; @@ -125,7 +126,7 @@ program = let emulator = pkgs.androidenv.emulateApp { name = "PrivateStorage Mobile"; - platformVersion = "31"; + inherit platformVersion; abiVersion = "x86_64"; systemImageType = "default"; app = self.packages.${system}.apk;