b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #206968 from jakobkukla/fix-androidenv-emu

Browse source 
androidenv: fix missing `inherit os` and default emulatorVersion
This commit is contained in:
Artturi 2022-12-20 11:13:55 +02:00 committed by GitHub
parent ba962cc4bb 14c7a30161
commit 23ec413f4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/languages-frameworks/android.section.md
View file

@ -232,7 +232,6 @@ androidenv.emulateApp {
platformVersion = "24";
abiVersion = "armeabi-v7a"; # mips, x86, x86_64
systemImageType = "default";
useGoogleAPIs = false;
app = ./MyApp.apk;
package = "MyApp";
activity = "MainActivity";

4
pkgs/development/mobile/androidenv/compose-android-packages.nix
View file

@ -6,7 +6,7 @@
, platformToolsVersion ? "33.0.2"
, buildToolsVersions ? [ "32.0.0" ]
, includeEmulator ? false
, emulatorVersion ? "31.3.7"
, emulatorVersion ? "31.3.9"
, platformVersions ? []
, includeSources ? false
, includeSystemImages ? false
@ -250,7 +250,7 @@ rec {
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
'' else callPackage ./tools.nix {
inherit deployAndroidPackage packages toolsVersion;
inherit deployAndroidPackage packages toolsVersion os;
postInstall = ''
# Symlink all requested plugins