diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-23 13:06:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-23 13:06:45 +0200 |
| commit | 1aed1a844028620f44653ee6a82eb4f9cd8dc977 (patch) | |
| tree | a762e705135ac1cb96e30697af8efd2d7b34eba6 /pkgs/development/libraries/glib/default.nix | |
| parent | f0a2f68fb43b7ea8b96710a673ba0f28393ecb09 (diff) | |
| parent | 5979a0a0726e9d234c7d64416251ca5a7a6e0527 (diff) | |
Merge #168747: glib: 2.72.0 -> 2.72.1 (into staging)
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 97da2a7c3be02..2c02bac92d2ca 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,23 +45,15 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.72.0"; + version = "2.72.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950="; + sha256 = "wH5XFHslTO+SzoCgN43AwCpDWOfeRwLp9AMGl4EJX+I="; }; patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch - - # Fix Inkscape compilation with clang++ - # https://gitlab.gnome.org/GNOME/glib/-/issues/2625 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/97d39b745ff1f621424f68a41ce0a7c5bb554c87.patch"; - sha256 = "wftuyf3ExFfrISngCQpEUpIGfHCCLXeYv/PEb/TE6a8="; - revert = true; - }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch |