Merge pull request #168391 from danielbarter/android-studio_tiling_wm
android-studio: fixing gui on tiling window managers
commit4f68abccd846f5505fe1227b309f62392050acf7
authorSandro <sandro.jaeckel@gmail.com>
dateWed 4 May 2022, 13:46 (5 years ago)
parentc1fb46858b94a6
pkgs/applications/editors/android-studio/common.nix+2
@@ -52,6 +52,7 @@
5252, xkeyboard_config
5353, zlib
5454, makeDesktopItem
55+, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper
5556}:
5657
5758let
@@ -80,6 +81,7 @@ let
8081 --set-default JAVA_HOME "$out/jre" \
8182 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
8283 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
84+ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \
8385 --set FONTCONFIG_FILE ${fontsConf} \
8486 --prefix PATH : "${lib.makeBinPath [
8587
pkgs/applications/editors/android-studio/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
1+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }:
22
33let
44 mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -7,6 +7,7 @@ let
77 };
88 inherit (gnome2) GConf gnome_vfs;
99 inherit buildFHSUserEnv;
10+ inherit tiling_wm;
1011 };
1112 stableVersion = {
1213 version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"