diff options
| author | Daniel Barter <danielbarter@gmail.com> | 2022-04-12 10:04:53 -0700 |
|---|---|---|
| committer | Daniel Barter <danielbarter@gmail.com> | 2022-04-12 13:30:40 -0700 |
| commit | 58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13 (patch) | |
| tree | 087fb7a890cb44b8297ee42656cda5f6bf09ec8c /pkgs/applications/editors/android-studio | |
| parent | 592dc9ed7f049c565e9d7c04a4907e57ae17e2d9 (diff) | |
| download | nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar.gz nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar.bz2 nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar.lz nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar.xz nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.tar.zst nixpkgs-58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13.zip | |
android-studio: fixing gui for 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 12324088b04..3a8112d7868 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 e7824cd93f1..f0feae8deb9 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.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" |