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

---
 common/desktop.nix       |  2 +-
 common/hikari-gtk4.patch | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 common/hikari-gtk4.patch

(limited to 'common')

diff --git a/common/desktop.nix b/common/desktop.nix
index 3bd8108..37c299f 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -50,7 +50,7 @@
   programs.slock.enable = true;
 
   environment.systemPackages = with pkgs; [
-    (hikari.overrideAttrs (old: {patches = [ ./hikari-gtk4.patch ]; })) fuzzel
+    hikari fuzzel
   ];
 
   security.pam.services.hikari-unlocker.text = ''
diff --git a/common/hikari-gtk4.patch b/common/hikari-gtk4.patch
deleted file mode 100644
index 68d8cf1..0000000
--- a/common/hikari-gtk4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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