diff options
| author | Colin <colin@uninsane.org> | 2024-05-13 17:27:30 +0000 |
|---|---|---|
| committer | Colin <colin@uninsane.org> | 2024-05-24 01:44:26 +0000 |
| commit | 1ad936e7ce78f591f095f872543821b204a4a5d0 (patch) | |
| tree | 675663d6971faa9df76e1939bf2eafacd09f686d /pkgs/desktops/gnome/core/gnome-keyring/default.nix | |
| parent | 8fe1aa682515b81a58125b72afae246555d68bce (diff) | |
gnome.gnome-keyring: support cross compilation
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-keyring/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-keyring/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 472d9a413513c..d8a455b0b9faa 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -10,7 +10,6 @@ , libxslt , gettext , gcr -, autoreconfHook , libcap_ng , libselinux , p11-kit @@ -37,8 +36,6 @@ stdenv.mkDerivation rec { pkg-config gettext libxslt - # Upstream uses ancient autotools to pre-generate the scripts. - autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 wrapGAppsHook3 @@ -63,6 +60,10 @@ 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" + # 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. |