Merge pull request #114223 from meutraa/update/android-studio

androidStudioPackages: change --set JAVA_HOME to --set-default in wra…
This commit is contained in:
Michael Weiss 2021-03-01 15:49:56 +01:00 committed by GitHub
commit c4e4ba0967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -72,8 +72,8 @@ let
installPhase = ''
cp -r . $out
wrapProgram $out/bin/studio.sh \
--set-default JAVA_HOME "$out/jre" \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set JAVA_HOME "$out/jre" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf} \
--prefix PATH : "${lib.makeBinPath [