diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-04 13:46:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 13:46:59 +0200 |
| commit | 4f68abccd846f5505fe1227b309f62392050acf7 (patch) | |
| tree | 4043dccf859d9a7b6d2004c7d4438a8c388a77dc /pkgs/applications/editors/android-studio | |
| parent | c1fb4681db42dbeb3785fa239b43b16c1b3d2307 (diff) | |
| parent | 58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13 (diff) | |
| download | nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar.gz nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar.bz2 nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar.lz nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar.xz nixlib-4f68abccd846f5505fe1227b309f62392050acf7.tar.zst nixlib-4f68abccd846f5505fe1227b309f62392050acf7.zip | |
Merge pull request #168391 from danielbarter/android-studio_tiling_wm
android-studio: fixing gui on tiling window managers
Diffstat (limited to 'pkgs/applications/editors/android-studio')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index ac293faee3b5..874a1bb63ccc 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -52,6 +52,7 @@ , xkeyboard_config , zlib , makeDesktopItem +, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper }: let @@ -80,6 +81,7 @@ let --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 39bbff256525..cfd81fdfe5a2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }: +{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -7,6 +7,7 @@ let }; inherit (gnome2) GConf gnome_vfs; inherit buildFHSUserEnv; + inherit tiling_wm; }; stableVersion = { version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)" |