diff options
| author | Yelninei <yelninei@tutamail.com> | 2026-08-20 18:27:21 +0000 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-08-28 16:40:53 +0200 |
| commit | a91a84034a5d6778af84cf433077bcc461b6f4f1 (patch) | |
| tree | ff72a5df8b23eff8c5c974f0efb222a1c536c42f | |
| parent | ac4f45cfbca8235fee17e74c5b9635c7f369800a (diff) | |
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 <andreas@enge.fr>
| -rw-r--r-- | gnu/packages/gnupg.scm | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index da068596e42..a0bcca427a6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm | |||
| @@ -350,17 +350,19 @@ compatible to GNU Pth.") | |||
| 350 | (native-inputs | 350 | (native-inputs |
| 351 | (list pkg-config)) | 351 | (list pkg-config)) |
| 352 | (inputs | 352 | (inputs |
| 353 | (list gnutls | 353 | (append (if (target-hurd?) |
| 354 | libassuan | 354 | '() |
| 355 | libgcrypt | 355 | (list pcsc-lite)) |
| 356 | libgpg-error | 356 | (list gnutls |
| 357 | libksba | 357 | libassuan |
| 358 | npth | 358 | libgcrypt |
| 359 | openldap | 359 | libgpg-error |
| 360 | pcsc-lite | 360 | libksba |
| 361 | readline | 361 | npth |
| 362 | sqlite | 362 | openldap |
| 363 | zlib)) | 363 | readline |
| 364 | sqlite | ||
| 365 | zlib))) | ||
| 364 | (arguments | 366 | (arguments |
| 365 | (list | 367 | (list |
| 366 | #:configure-flags | 368 | #:configure-flags |
| @@ -392,11 +394,13 @@ compatible to GNU Pth.") | |||
| 392 | #~(modify-phases %standard-phases | 394 | #~(modify-phases %standard-phases |
| 393 | (add-before 'configure 'patch-paths | 395 | (add-before 'configure 'patch-paths |
| 394 | (lambda* (#:key inputs #:allow-other-keys) | 396 | (lambda* (#:key inputs #:allow-other-keys) |
| 395 | (let ((libpcsclite.so (search-input-file inputs | 397 | (let ((libpcsclite.so (false-if-exception |
| 396 | "lib/libpcsclite.so"))) | 398 | (search-input-file inputs |
| 397 | (substitute* "scd/scdaemon.c" | 399 | "lib/libpcsclite.so")))) |
| 398 | (("libpcsclite\\.so") | 400 | (when libpcsclite.so |
| 399 | libpcsclite.so))))) | 401 | (substitute* "scd/scdaemon.c" |
| 402 | (("libpcsclite\\.so") | ||
| 403 | libpcsclite.so)))))) | ||
| 400 | (add-after 'build 'patch-scheme-tests | 404 | (add-after 'build 'patch-scheme-tests |
| 401 | (lambda _ | 405 | (lambda _ |
| 402 | (substitute* (find-files "tests" ".\\.scm$") | 406 | (substitute* (find-files "tests" ".\\.scm$") |
