dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #311773 from uninsane/pr-gnome-keyring-cross

Browse Source 
gnome.gnome-keyring: support cross compilation
This commit is contained in:
Artturin 2024-05-29 21:06:00 +03:00 committed by GitHub
commit b79309a470
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@
, libxslt , libxslt
, gettext , gettext
, gcr , gcr
, autoreconfHook
, libcap_ng , libcap_ng
, libselinux , libselinux
, p11-kit , p11-kit
@ -37,8 +36,6 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
gettext gettext
libxslt libxslt
# Upstream uses ancient autotools to pre-generate the scripts.
autoreconfHook
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
wrapGAppsHook3 wrapGAppsHook3
@ -63,6 +60,10 @@ stdenv.mkDerivation rec {
# gnome-keyring doesn't build with ssh-agent by default anymore, we need to # 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 # switch to using gcr https://github.com/NixOS/nixpkgs/issues/140824
"--enable-ssh-agent" "--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. # Tends to fail non-deterministically.