From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: gnurl: Add ca-bundle to config. Date: Wed, 4 Jan 2017 17:32:16 +0000 Message-ID: <20170104173216.2959-2-ng0@libertad.pw> References: <20170104173216.2959-1-ng0@libertad.pw> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOpPl-0003fk-AW for guix-devel@gnu.org; Wed, 04 Jan 2017 12:31:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOpPi-0006Zi-6R for guix-devel@gnu.org; Wed, 04 Jan 2017 12:31:53 -0500 Received: from aibo.runbox.com ([91.220.196.211]:60321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOpPh-0006YM-Rw for guix-devel@gnu.org; Wed, 04 Jan 2017 12:31:50 -0500 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cOpPf-00018i-Dh for guix-devel@gnu.org; Wed, 04 Jan 2017 18:31:47 +0100 In-Reply-To: <20170104173216.2959-1-ng0@libertad.pw> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/gnunet.scm (gnurl)[arguments]: Add "--with-ca-bundle" configure flag. [arguments]: configure-flags: Use list. [arguments]: Add "nss-certs" to native-inputs. --- gnu/packages/gnunet.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 27e1ffb4e..451293c9f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +27,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) + #:use-module (gnu packages certs) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages gettext) @@ -184,20 +185,26 @@ and support for SSL3 and TLS.") ("libtool" ,libtool) ("groff" ,groff) ("perl" ,perl) + ("nss-certs" ,nss-certs) ("pkg-config" ,pkg-config) ("python" ,python-2))) (arguments - `(#:configure-flags '("--enable-ipv6" "--with-gnutls" "--without-libssh2" - "--without-libmetalink" "--without-winidn" - "--without-librtmp" "--without-nghttp2" - "--without-nss" "--without-cyassl" - "--without-polarssl" "--without-ssl" - "--without-winssl" "--without-darwinssl" - "--disable-sspi" "--disable-ntlm-wb" - "--disable-ldap" "--disable-rtsp" "--disable-dict" - "--disable-telnet" "--disable-tftp" "--disable-pop3" - "--disable-imap" "--disable-smtp" "--disable-gopher" - "--disable-file" "--disable-ftp" "--disable-smb") + `(#:configure-flags (list + "--enable-ipv6" "--with-gnutls" "--without-libssh2" + "--without-libmetalink" "--without-winidn" + "--without-librtmp" "--without-nghttp2" + "--without-nss" "--without-cyassl" + "--without-polarssl" "--without-ssl" + "--without-winssl" "--without-darwinssl" + "--disable-sspi" "--disable-ntlm-wb" + "--disable-ldap" "--disable-rtsp" "--disable-dict" + "--disable-telnet" "--disable-tftp" "--disable-pop3" + "--disable-imap" "--disable-smtp" "--disable-gopher" + "--disable-file" "--disable-ftp" "--disable-smb" + (string-append + "--with-ca-bundle=" + (string-append (assoc-ref %build-inputs "nss-certs") + "/etc/ssl/certs/ca-certificates.crt"))) #:test-target "test" #:parallel-tests? #f #:phases -- 2.11.0