Merge pull request #322988 from JohnRTitor/fix-glib-darwin

glib: fix build on aarch64-darwin
This commit is contained in:
Masum Reza 2024-06-28 17:29:32 +05:30 committed by GitHub
commit 64123c7c40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2,6 +2,7 @@
, lib
, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -69,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = lib.optionals stdenv.isDarwin [
./darwin-compilation.patch
# FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/9d0988ca62ee96e09aa76abbd65ff192cfce6858.patch";
hash = "sha256-JrR3Ba6L+3M0Nt8DgHmPG8uKtx7hOgUp7np08ATIzjA=";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
./quark_init_on_demand.patch
./gobject_init_on_demand.patch