public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

androidenv: fix deployment of google_apis* system images

Browse Source 
Fixes #56866
This commit is contained in:
Erik Arvstedt 2019-08-17 10:48:05 +02:00
parent 21a9aa0fcc
commit e48d97f640
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -121,6 +121,12 @@ rec {
deployAndroidPackage { deployAndroidPackage {
inherit os; inherit os;
package = system-images-packages.${apiVersion}.${type}.${abiVersion}; package = system-images-packages.${apiVersion}.${type}.${abiVersion};
# Patch 'google_apis' system images so they're recognized by the sdk.
# Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
# of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
patchInstructions = stdenv.lib.optionalString (stdenv.lib.hasPrefix "google_apis" type) ''
sed -i '/^Addon.Vendor/d' source.properties
'';
} }
) abiVersions ) abiVersions
) systemImageTypes ) systemImageTypes