diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-23 01:26:57 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-23 22:41:06 -0400 |
commit | 5cf6f6fe7b610e50d4f723f345799092d2b518ba (patch) | |
tree | b126c4e57b0d8b3665a0fbc1f53c9efa45b1ddd7 /gnu | |
parent | ddda7038405b9be8828bc9f55780cfff4dcf53e9 (diff) | |
download | guix-patches-5cf6f6fe7b610e50d4f723f345799092d2b518ba.tar guix-patches-5cf6f6fe7b610e50d4f723f345799092d2b518ba.tar.gz |
gnu: gnutls: Fix build.
Fixes <http://issues.guix.gnu.org/43561>.
* gnu/packages/tls.scm (gnutls)[phases]{disable-failing-tests}: Add phase.
[native-inputs]: Add autoconf, automake, gettext-minimal, libtool and texinfo.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/tls.scm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a773b07b76..c5f25aaa55 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,11 +46,13 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages compression) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages dns) #:use-module (gnu packages gawk) + #:use-module (gnu packages gettext) #:use-module (gnu packages guile) #:use-module (gnu packages hurd) #:use-module (gnu packages libbsd) @@ -211,8 +214,16 @@ living in the same process.") "--without-p11-kit") #:phases (modify-phases %standard-phases - (add-after - 'install 'move-doc + ;; fastopen.sh fails to connect to the server in the builder + ;; environment (see: + ;; https://gitlab.com/gnutls/gnutls/-/issues/1095). + (add-after 'unpack 'disable-failing-tests + (lambda _ + (delete-file "configure") + (substitute* "tests/Makefile.am" + (("fastopen.sh") "")) + #t)) + (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) ;; Copy the 4.1 MiB of section 3 man pages to "doc". (let* ((out (assoc-ref outputs "out")) @@ -229,7 +240,12 @@ living in the same process.") (native-inputs `(,@(if (hurd-target?) '() `(("net-tools" ,net-tools))) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) ("which" ,which) ,@(if (hurd-target?) '() `(("datefudge" ,datefudge))) ;tests rely on 'datefudge' |