diff options
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-keyring/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-keyring/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 61247a1dc75ca..d8a455b0b9faa 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -10,12 +10,11 @@ , libxslt , gettext , gcr -, autoreconfHook , libcap_ng , libselinux , p11-kit , openssh -, wrapGAppsHook +, wrapGAppsHook3 , docbook-xsl-nons , docbook_xml_dtd_43 , gnome @@ -24,24 +23,22 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "42.1"; + version = "46.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; + hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y="; }; nativeBuildInputs = [ pkg-config gettext libxslt - # Upstream uses ancient autotools to pre-generate the scripts. - autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -60,6 +57,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" + # gnome-keyring doesn't build with ssh-agent by default anymore, we need to + # switch to using gcr https://github.com/NixOS/nixpkgs/issues/140824 + "--enable-ssh-agent" + # cross compilation requires these paths to be explicitly declared: + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + "SSH_ADD=${lib.getExe' openssh "ssh-add"}" + "SSH_AGENT=${lib.getExe' openssh "ssh-agent"}" ]; # Tends to fail non-deterministically. |