From 56bc064c0fa39614dfd1048daae4a59e4131df56 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 13 May 2024 17:27:30 +0000 Subject: [PATCH] gnome.gnome-keyring: support cross compilation --- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 472d9a413513..13610beeea3c 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation rec { # 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" + "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. @@ -72,6 +75,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build + addToSearchPath ACLOCAL_PATH ${lib.getDev libgcrypt}/share/aclocal ''; checkPhase = ''