public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
androidStudioPackages: set JAVA_HOME in wrapper to bundled version
This commit is contained in:
Sandro 2021-02-10 23:30:20 +01:00 committed by GitHub
commit 758b29b5a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/android-studio/common.nix
View File

@ -73,6 +73,9 @@ let
cp -r . $out cp -r . $out
wrapProgram $out/bin/studio.sh \ wrapProgram $out/bin/studio.sh \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --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 [ --prefix PATH : "${lib.makeBinPath [
# Checked in studio.sh # Checked in studio.sh
@ -139,9 +142,7 @@ let
gnome_vfs gnome_vfs
glib glib
GConf GConf
]}" \ ]}"
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
# AS launches LLDBFrontend with a custom LD_LIBRARY_PATH # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [