diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-15 06:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 06:01:51 +0000 |
| commit | 39b3610a57f3960a7c93f25469445328acf842a8 (patch) | |
| tree | 9485d5acfd12b917a4b0fa36a827dc529a104efa /pkgs/development/libraries/glib | |
| parent | 69f590dff5d0ab6bf65ac76c7524d4341c6f31af (diff) | |
| parent | 1f4c790f716a7bad8bb000e5cf07e3b5d36a48b8 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5cfce3cdd19f3..4f4b6b6dd3a6a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,14 @@ -{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 +{ config +, lib +, stdenv +, fetchurl +, fetchpatch +, gettext +, meson +, ninja +, pkg-config +, perl +, python3 , libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -95,6 +105,14 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch + + # Fix infinite loop (e.g. in gnome-keyring) + # https://github.com/NixOS/nixpkgs/pull/197754#issuecomment-1312805358 + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch"; + sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; |