public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111557 from collares/keyring-capng

Browse Source 
gnome-keyring: Fix compatibility with libcap_ng >= 0.8.1
This commit is contained in:
Jan Tojnar 2021-02-01 17:47:39 +01:00 committed by GitHub
commit 1b718ca527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@ -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 , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
, docbook_xsl, docbook_xml_dtd_43, gnome3 }: , docbook_xsl, docbook_xml_dtd_43, gnome3 }:
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; 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" ]; outputs = [ "out" "dev" ];
buildInputs = [ buildInputs = [