summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Gaspard <leo@gaspard.io>2022-11-20 20:58:54 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-12-06 20:23:33 +0000
commit9c6db1c571d7fcf91877c91aff3088faf393607c (patch)
tree9dcbc92ce8e91c8e3dabec2f29bbd9a08fae4da5
parentMerge pull request #204580 from NixOS/backport-203827-to-release-22.05 (diff)
downloadnixpkgs-9c6db1c571d7fcf91877c91aff3088faf393607c.tar.gz
androidenv: use emulator from the path that makes it find qemu
(cherry picked from commit d0e691c9fee72b55fa4ecfe88e72cdd696e08100)
-rw-r--r--pkgs/development/mobile/androidenv/compose-android-packages.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index ed4cb4d527b1..bf5f937edcde 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -305,6 +305,11 @@ rec {
ln -s $i $out/bin
done
+ ${lib.optionalString includeEmulator ''
+ rm $out/bin/emulator
+ ln -s $out/libexec/android-sdk/emulator/emulator $out/bin
+ ''}
+
# Write licenses
mkdir -p licenses
${lib.concatMapStrings (licenseName: