From d58439ed622f704c1e6da9a167320c49869d9f29 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sun, 29 Oct 2023 18:23:16 +0100
Subject: xfce.xfconf: fix segfaults after update to 4.18.2

xfconf 4.18.2 suffers a bug in its cache
handling that causes regular segfaults in xfwm:

https://gitlab.xfce.org/xfce/xfconf/-/issues/35

The commit at hand introduces a patch
which will also be part of the next relese.
---
 pkgs/desktops/xfce/core/xfconf/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 169efcb2c3254..16e6fb3209289 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -1,4 +1,10 @@
-{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }:
+{ lib
+, mkXfceDerivation
+, fetchpatch
+, libxfce4util
+, gobject-introspection
+, vala
+}:
 
 mkXfceDerivation {
   category = "xfce";
@@ -7,6 +13,16 @@ mkXfceDerivation {
 
   sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI=";
 
+  patches = [
+    # fixes a segfault, can likely be removed with 4.18.3,
+    # see https://gitlab.xfce.org/xfce/xfconf/-/issues/35#note_81151
+    (fetchpatch {
+      name = "cache-fix-uncached-value.patch";
+      url = "https://gitlab.xfce.org/xfce/xfconf/-/commit/03f7ff961fd46c9141aba624a278e19de0bf3211.diff";
+      hash = "sha256-n9Wvt7NfKMxs2AcjUWgs4vZgzLUG9jyEVTZxINko4h8=";
+    })
+  ];
+
   nativeBuildInputs = [ gobject-introspection vala ];
 
   buildInputs = [ libxfce4util ];
-- 
cgit 1.4.1