diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-27 01:26:09 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-27 01:26:09 -0400 |
| commit | 1640f16e7888291227d11647dbb5f83ad5d138a1 (patch) | |
| tree | bf979aa4e6538b8261762cfbb80512ebb023b016 /gnu/packages/tls.scm | |
| parent | 0ff4e49a95d8a54cd5508f441b927a670d348519 (diff) | |
| parent | a4e45acdc07fc3faf2844b3658ee31ebc538bd1c (diff) | |
| download | guix-1640f16e7888291227d11647dbb5f83ad5d138a1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7f1f6ef72b..618b1a15f7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; @@ -115,7 +115,7 @@ in intelligent transportation networks.") (define-public p11-kit (package (name "p11-kit") - (version "0.23.10") + (version "0.23.11") (source (origin (method url-fetch) @@ -123,7 +123,7 @@ in intelligent transportation networks.") "download/" version "/p11-kit-" version ".tar.gz")) (sha256 (base32 - "0hxfwnyb5yllvlsh0cj6favcph36gm94b6df7zhl7xay48zjl8gr")))) + "0asaxbypvns5xf9hb5jy0kijz0b3hp1s8likhywmry3klpdchhxj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -131,7 +131,17 @@ in intelligent transportation networks.") `(("libffi" ,libffi) ("libtasn1" ,libtasn1))) (arguments - `(#:configure-flags '("--without-trust-paths"))) + `(#:configure-flags '("--without-trust-paths") + #:phases (modify-phases %standard-phases + (add-before 'check 'prepare-tests + (lambda _ + ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up + ;; and looks for .cache and other directories (only). + ;; For simplicity just drop it since it is irrelevant + ;; in the build container. + (substitute* "Makefile" + (("test-runtime\\$\\(EXEEXT\\)") "")) + #t))))) (home-page "https://p11-glue.freedesktop.org/p11-kit.html") (synopsis "PKCS#11 library") (description |