diff options
| author | Masum Reza <50095635+JohnRTitor@users.noreply.github.com> | 2024-06-28 17:29:32 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-28 17:29:32 +0530 |
| commit | 64123c7c40b4051e6c383a663f3d9523ba174b05 (patch) | |
| tree | b2e8da608fc90462ca8dbfaaf2579dfdacd37c4d /pkgs/development | |
| parent | d3f2171a633fd924de6befcf50c7bc28d460e49a (diff) | |
| parent | e599720d4f128f6dd47deba052fa45c17cdd5045 (diff) | |
Merge pull request #322988 from JohnRTitor/fix-glib-darwin
glib: fix build on aarch64-darwin
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index beea26fbe1032..47ca3f35b218f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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 |