diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-10-30 07:45:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 07:45:22 +0800 |
| commit | fd60b2a5ce46b5dd24748950170b9e17d208bdc0 (patch) | |
| tree | 90c73a64795089814b34689b7e11719dee7d413c /pkgs/desktops | |
| parent | b27bf82fba6e9d52496bbf58950bb4cc4004ef18 (diff) | |
| parent | d58439ed622f704c1e6da9a167320c49869d9f29 (diff) | |
Merge pull request #264230 from Yarny0/xfce-xfconf-fix-segfault
xfce.xfconf: fix xfwm4 segfaults after update to 4.18.2
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfconf/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
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 ]; |