From ad25aa109830df7e8a0237e33638cdccf3cc9daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Tue, 6 Dec 2022 21:16:49 +0100 Subject: [PATCH] androidenv: use emulator from the path that makes it find qemu (#202088) --- .../mobile/androidenv/compose-android-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 217922886df8..e379c12f9716 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -312,6 +312,12 @@ rec { ln -s $i $out/bin done + # the emulator auto-linked from platform-tools does not find its local qemu, while this one does + ${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: