Merge pull request #33634 from Ma27/android-studio/support-virtual-devices

android-studio: set `ANDROID_EMULATOR_USE_SYSTEM_LIBS`

Changed files
+2 -2
pkgs
applications
editors
android-studio
+2 -2
pkgs/applications/editors/android-studio/common.nix
···
let
androidStudio = stdenv.mkDerivation {
-
name = "${pname}";
+
name = "${pname}-${version}";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
···
installPhase = ''
cp -r . $out
wrapProgram $out/bin/studio.sh \
+
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set PATH "${stdenv.lib.makeBinPath [
# Checked in studio.sh
···
# Runtime stuff
git
-
]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [