git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112667 from meutraa/update/android-studio

androidStudioPackages: set JAVA_HOME in wrapper to bundled version

commit758b29b5a28b818e311ad540637a5c1e40867489 authorSandro <sandro.jaeckel@gmail.com> dateWed 10 Feb 2021, 23:30 (6 years ago) parentf6803b4337aecf
1 file changed+4−3
pkgs/applications/editors/android-studio/common.nix+4−3
pkgs/applications/editors/android-studio/common.nix+4−3
@@ -73,6 +73,9 @@ let
7373 cp -r . $out
7474 wrapProgram $out/bin/studio.sh \
7575 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
76+ --set JAVA_HOME "$out/jre" \
77+ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
78+ --set FONTCONFIG_FILE ${fontsConf} \
7679 --prefix PATH : "${lib.makeBinPath [
7780
7881 # Checked in studio.sh
@@ -139,9 +142,7 @@ let
139142 gnome_vfs
140143 glib
141144 GConf
142− ]}" \
143− --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
144− --set FONTCONFIG_FILE ${fontsConf}
145+ ]}"
145146
146147 # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
147148 wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [