me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnutls: Enable p11-kit. 

Everywhere except mips64el, where a comment says it doesn't work. I can't test
as I can't build this on mips64el anyway.

This change will enable running the tests for libcacard.

* gnu/packages/tls.scm (gnutls)[arguments]: Only specify --without-p11-kit on
mips64el.
[inputs]: Include the p11-kit for all systems except mips64el.
master
Christopher Baines 2020-04-16 09:30:44 +01:00
parent 6731fc6ab8
commit 28a13226fd
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/tls.scm
View File

@ -188,7 +188,7 @@ living in the same process.")
'() '()
(list net-tools iproute socat)) (list net-tools iproute socat))
#:configure-flags #:configure-flags
(list (cons*
;; GnuTLS doesn't consult any environment variables to specify ;; GnuTLS doesn't consult any environment variables to specify
;; the location of the system-wide trust store. Instead it has a ;; the location of the system-wide trust store. Instead it has a
;; configure-time option. Unless specified, its configure script ;; configure-time option. Unless specified, its configure script
@ -209,9 +209,14 @@ living in the same process.")
(string-append "--with-guile-extension-dir=" (string-append "--with-guile-extension-dir="
"$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions") "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")
;; FIXME: Temporarily disable p11-kit support since it is not (let ((system ,(or (%current-target-system)
;; working on mips64el. (%current-system))))
"--without-p11-kit") (if (string-prefix? "mips64el" system)
(list
;; FIXME: Temporarily disable p11-kit support since it is
;; not working on mips64el.
"--without-p11-kit")
'())))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
;; fastopen.sh fails to connect to the server in the builder ;; fastopen.sh fails to connect to the server in the builder
@ -250,7 +255,12 @@ living in the same process.")
`(("datefudge" ,datefudge))) ;tests rely on 'datefudge' `(("datefudge" ,datefudge))) ;tests rely on 'datefudge'
("util-linux" ,util-linux))) ;one test needs 'setsid' ("util-linux" ,util-linux))) ;one test needs 'setsid'
(inputs (inputs
`(("guile" ,guile-3.0))) `(("guile" ,guile-3.0)
,@(let ((system (or (%current-target-system)
(%current-system))))
(if (string-prefix? "mips64el" system)
'()
`(("p11-kit" ,p11-kit))))))
(propagated-inputs (propagated-inputs
;; These are all in the 'Requires.private' field of gnutls.pc. ;; These are all in the 'Requires.private' field of gnutls.pc.
`(("libtasn1" ,libtasn1) `(("libtasn1" ,libtasn1)