nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 18:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #168391 from danielbarter/android-studio_tiling_wm

Browse Source 
android-studio: fixing gui on tiling window managers
This commit is contained in:
Sandro 2022-05-04 13:46:59 +02:00 committed by GitHub
commit 4f68abccd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 [

3
pkgs/applications/editors/android-studio/default.nix
View File

@ -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)"