diff options
| author | Mika Tammi <mikatammi@gmail.com> | 2022-11-24 03:41:30 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-11-25 10:40:28 +0000 |
| commit | ce951f9487d32a1aebd9c1a0165a0cd374c2f1d1 (patch) | |
| tree | d179677d86e84c2456a74b332eb76d25dc866a86 | |
| parent | Merge pull request #202821 from NixOS/backport-202659-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-202618-to-release-22.11.tar.gz | |
glib: fix build with muslorigin/backport-202618-to-release-22.11
(cherry picked from commit ec30ef4e4c499f2ffa55621b36928b999cd6ade8)
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9fc05f5f8754..44639040f94a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -68,6 +68,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch + + # Fix error about missing sentinel in glib/tests/cxx.cpp + # These two commits are part of already merged glib MRs 3033 and 3031: + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3033 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066.patch"; + sha256 = "OfD5zO/7JIgOMLc0FAgHV9smWugFJuVPHCn9jTsMQJg="; + }) + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3031 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4.patch"; + sha256 = "v28Yk+R0kN9ssIcvJudRZ4vi30rzQEE8Lsd1kWp5hbM="; + }) ] ++ [ ./glib-appinfo-watch.patch ./schema-override-variable.patch |