swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #168747: glib: 2.72.0 -> 2.72.1 (into staging)

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-23 13:06:45 +02:00
parent f0a2f68fb4 5979a0a072
commit 1aed1a8440
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/glib/default.nix
View file

@ -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