diff options
| author | meutraa <paul@lost.host> | 2021-02-10 17:30:03 +0000 |
|---|---|---|
| committer | meutraa <paul@lost.host> | 2021-02-10 17:30:03 +0000 |
| commit | 337aecf983b75e16aaa23d260d78443cb79778c7 (patch) | |
| tree | b8fdbe5658bda1344e0afeca69e40c9e4d79d2b6 /pkgs/applications/editors | |
| parent | b49e5d4a7a72f992c67d7fce0c4ef5ca15cfbc66 (diff) | |
| download | nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar.gz nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar.bz2 nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar.lz nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar.xz nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.tar.zst nixlib-337aecf983b75e16aaa23d260d78443cb79778c7.zip | |
androidStudioPackages: set JAVA_HOME in wrapper to bundled version
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 7 |
1 files 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 [ |