diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-01 17:47:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 17:47:39 +0100 |
commit | 1b718ca527451d2e3eae0c957991599241711289 (patch) | |
tree | 2b94020459c54bfe41616ee55124bc981c424e9b | |
parent | 6775c29ef965ca1be155959ac4b2a7e9137058f6 (diff) | |
parent | 8b2af232f9d69fb595495e0fbd63e10eea9b9c19 (diff) |
Merge pull request #111557 from collares/keyring-capng
gnome-keyring: Fix compatibility with libcap_ng >= 0.8.1
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index cea158205574d..93453cc72e949 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; }; + patches = [ + # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; + sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = [ |