diff options
| author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2019-08-17 10:48:05 +0200 |
|---|---|---|
| committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2019-08-17 11:18:59 +0200 |
| commit | e48d97f640c410667464ff34c54617912145a430 (patch) | |
| tree | c7b78eb8b0d6f13a21dc15a75568035f1a726ef6 /pkgs/development/mobile | |
| parent | 21a9aa0fcc83871ef5dbc481e8bab58667a8b5ed (diff) | |
| download | nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar.gz nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar.bz2 nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar.lz nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar.xz nixpkgs-e48d97f640c410667464ff34c54617912145a430.tar.zst nixpkgs-e48d97f640c410667464ff34c54617912145a430.zip | |
androidenv: fix deployment of google_apis* system images
Fixes #56866
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/compose-android-packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e5802c12e81..28c3b120f39 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -121,6 +121,12 @@ rec { deployAndroidPackage { inherit os; 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 ) systemImageTypes |