guix_mirror_bot pushed a commit to branch ruby-team
in repository guix.
commit e969920d169f2feb945946b78fd2c6511b33f5b7
Author: Yelninei <[email protected]>
AuthorDate: Thu Aug 20 18:27:21 2026 +0000
gnu: gnupg: Fix build on the Hurd.
* gnu/packages/gnupg.scm (gnupg)[inputs]: Make pcsc-lite conditional.
[arguments]<#:phases>: Allow 'patch-paths to fail to find lib pcsclite.so.
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/gnupg.scm | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index da068596e4..a0bcca427a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -350,17 +350,19 @@ compatible to GNU Pth.")
(native-inputs
(list pkg-config))
(inputs
- (list gnutls
- libassuan
- libgcrypt
- libgpg-error
- libksba
- npth
- openldap
- pcsc-lite
- readline
- sqlite
- zlib))
+ (append (if (target-hurd?)
+ '()
+ (list pcsc-lite))
+ (list gnutls
+ libassuan
+ libgcrypt
+ libgpg-error
+ libksba
+ npth
+ openldap
+ readline
+ sqlite
+ zlib)))
(arguments
(list
#:configure-flags
@@ -392,11 +394,13 @@ compatible to GNU Pth.")
#~(modify-phases %standard-phases
(add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let ((libpcsclite.so (search-input-file inputs
- "lib/libpcsclite.so")))
- (substitute* "scd/scdaemon.c"
- (("libpcsclite\\.so")
- libpcsclite.so)))))
+ (let ((libpcsclite.so (false-if-exception
+ (search-input-file inputs
+
"lib/libpcsclite.so"))))
+ (when libpcsclite.so
+ (substitute* "scd/scdaemon.c"
+ (("libpcsclite\\.so")
+ libpcsclite.so))))))
(add-after 'build 'patch-scheme-tests
(lambda _
(substitute* (find-files "tests" ".\\.scm$")
