about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorMaxine Aubrey <max@ine.dev>2024-03-03 01:13:43 +0100
committerMaxine Aubrey <max@ine.dev>2024-04-22 21:11:09 +0200
commit8a7a27a2a81ea1ecb664756cbf98cd1ba44f2e32 (patch)
tree8509912d6bfdc3cb6f0ef3af981d003c2e06e540 /pkgs/desktops
parentba447d674315ad0f157686403c7bd0ffb1d9f308 (diff)
gnome.gnome-keyring: 42.1 → 46.1
https://gitlab.gnome.org/GNOME/gnome-keyring/-/compare/42.1...46.1

Changelog-Reviewed-By: Maxine Aubrey <max@ine.dev>
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/core/gnome-keyring/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix
index 6a160f6cf77d5..95f90c40a3f05 100644
--- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix
@@ -24,13 +24,13 @@
 
 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 = [
@@ -60,6 +60,9 @@ 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"
   ];
 
   # Tends to fail non-deterministically.