diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-05-28 11:27:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 11:27:28 +0200 |
| commit | 79d4b41c9e8d4660227c2dfa20a406e97d3dfbb0 (patch) | |
| tree | faec59771e4af85c5c99adce0dfd21476ee31079 /pkgs/development/libraries/glib | |
| parent | 0a447c425c0abade89d789583687ffa2011310ee (diff) | |
| parent | 35f36cd087e6e6ab119407351f034e83159626ee (diff) | |
Merge pull request #314043 from OPNA2608/fix/glib-segfaults
glib: Apply fix for memory issues
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4ac8b6fb9f6ab..a60ba9fae6bfd 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -73,6 +74,15 @@ stdenv.mkDerivation (finalAttrs: { ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ + # Fix double-free & segfault issues on menu and dbus connection action group export failures + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073 + # Remove when version > 2.80.2 + (fetchpatch { + name = "GLib-Fix-memory-problems-on-gmenuexporter-and-gactiongroupexporter-error-paths.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/b9490a499a004618c883f180b1081a166ff1a86b.patch"; + hash = "sha256-c6uZ9NEhg26/2RdgjQ4s5ErCDm5HH6T/tfJXTwh/H6o="; + }) + # This patch lets GLib's GDesktopAppInfo API watch and notice changes # to the Nix user and system profiles. That way, the list of available # applications shown by the desktop environment is immediately updated |