From 86cf1da3d2444a984fec0e34c66aac8139207f06 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Thu, 16 Feb 2023 13:37:23 +0100
Subject: desktop/hikari: don't crash on gtk4 apps

---
 common/desktop.nix       |  2 +-
 common/hikari-gtk4.patch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 common/hikari-gtk4.patch

diff --git a/common/desktop.nix b/common/desktop.nix
index 6aae3d1..d5cba19 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -54,7 +54,7 @@
   programs.slock.enable = true;
 
   environment.systemPackages = with pkgs; [
-    hikari fuzzel
+    (hikari.overrideAttrs (old: {patches = [ ./hikari-gtk4.patch ]; })) fuzzel
   ];
 
   security.pam.services.hikari-unlocker.text = ''
diff --git a/common/hikari-gtk4.patch b/common/hikari-gtk4.patch
new file mode 100644
index 0000000..68d8cf1
--- /dev/null
+++ b/common/hikari-gtk4.patch
@@ -0,0 +1,17 @@
+diff -rN -u old-hikari/src/server.c new-hikari/src/server.c
+--- old-hikari/src/server.c	2023-02-16 13:15:24.797244377 +0100
++++ new-hikari/src/server.c	2023-02-16 13:15:24.797244377 +0100
+@@ -523,6 +523,9 @@
+ server_decoration_handler(struct wl_listener *listener, void *data)
+ {
+   struct wlr_server_decoration *wlr_decoration = data;
++  if (wlr_decoration->surface->role == NULL) {
++    return;
++  }
+   struct hikari_view *view =
+       wl_container_of(wlr_decoration->surface, view, surface);
+   struct wlr_xdg_surface *xdg_surface =
+patch bc1727d6444f21c0fb952e8c853d5110b5602403
+Author: alex@xanderio.de
+Date:   Fri Dec 17 20:14:29 CET 2021
+  * prevent gtk4 application from crashing hikari
\ No newline at end of file
-- 
cgit v1.2.3