Merge pull request #250178 from hacker1024/feature/gitkraken-wayland

gitkraken: Respect NIXOS_OZONE_WL
This commit is contained in:
kirillrdy
2024-03-30 21:14:11 +11:00
committed by GitHub
@@ -2,7 +2,7 @@
, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid
, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git
, libGL, zlib, cacert
}:
@@ -106,7 +106,7 @@ let
comment = "Graphical Git client from Axosoft";
}) ];
nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
# avoid double-wrapping
@@ -124,6 +124,10 @@ let
runHook postInstall
'';
preFixup = ''
gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}")
'';
postFixup = ''
pushd $out/share/${pname}
for file in gitkraken chrome-sandbox chrome_crashpad_handler; do