From c1d21178db1ec597c9c710ae8cdeae0389d32d39 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 14 Nov 2022 10:33:48 -0500
Subject: [PATCH] refactor out the choice of platformVersion
---
android.nix | 4 ++--
flake.nix | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/android.nix b/android.nix
index 982c65f..8d386ec 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 101a6ca..81dcb89 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;
--
GitLab