Merge pull request #264230 from Yarny0/xfce-xfconf-fix-segfault

xfce.xfconf: fix xfwm4 segfaults after update to 4.18.2
NixOS · Oct 29, 2023 · fd60b2a · fd60b2a
2 parents b27bf82 + d58439e
commit fd60b2a
Showing 1 changed file with 17 additions and 1 deletion.
diff --git 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 ];