From 838e0e09215cda9f855ee1a2b55001c8feb6ee55 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sat, 28 Oct 2023 20:52:58 +0200
Subject: desktop: hikari with debug

---
 pkgs/hikari-gtk4.patch | 17 +++++++++++++++++
 pkgs/overlay.nix       |  5 +++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/hikari-gtk4.patch

(limited to 'pkgs')

diff --git a/pkgs/hikari-gtk4.patch b/pkgs/hikari-gtk4.patch
new file mode 100644
index 0000000..68d8cf1
--- /dev/null
+++ b/pkgs/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
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 7c75d69..449182d 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -23,6 +23,11 @@ in
   galmon-core = self.callPackage ./galmon.nix {};
   galmon-full = self.callPackage ./galmon.nix { buildAll = true; };
 
+  hikari = super.hikari.overrideAttrs (old: {
+    makeFlags = old.makeFlags ++ [ "DEBUG=YES" ];
+    patches = [ ./hikari-gtk4.patch ];
+  });
+
   almanac = self.rustPlatform.buildRustPackage rec {
     pname = "almanac";
     version = "git";
-- 
cgit v1.2.3