Merge pull request #321913 from trofi/glib-update

glib: 2.80.2 -> 2.80.3
This commit is contained in:
Masum Reza
2024-06-23 13:54:11 +05:30
committed by GitHub
+2 -12
View File
@@ -2,7 +2,6 @@
, lib
, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@@ -61,11 +60,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "glib";
version = "2.80.2";
version = "2.80.3";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
hash = "sha256-uc+296W9WzEjj9XVbfImst2l6jdhFHW/ifag+UAP6L0=";
hash = "sha256-OUeg6t3Q82E9AjC7JG0MaeRhQsGQIvXEsbLjy6I21Bc=";
};
patches = lib.optionals stdenv.isDarwin [
@@ -74,15 +73,6 @@ 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