Merge #168747: glib: 2.72.0 -> 2.72.1 (into staging)
This commit is contained in:
commit
1aed1a8440
1 changed files with 2 additions and 10 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue