From 337aecf983b75e16aaa23d260d78443cb79778c7 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Wed, 10 Feb 2021 17:30:03 +0000
Subject: [PATCH] androidStudioPackages: set JAVA_HOME in wrapper to bundled
 version

---
 pkgs/applications/editors/android-studio/common.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index b760e83f8eea..1c3c4aade5ff 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -73,6 +73,9 @@ let
       cp -r . $out
       wrapProgram $out/bin/studio.sh \
         --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 [
 
           # Checked in studio.sh
@@ -139,9 +142,7 @@ let
           gnome_vfs
           glib
           GConf
-        ]}" \
-        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
-        --set FONTCONFIG_FILE ${fontsConf}
+        ]}"
 
       # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
       wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [