[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "gnu: glib-networking: Use '/etc/ssl/certs/ca-certificates
From: |
??? |
Subject: |
01/01: Revert "gnu: glib-networking: Use '/etc/ssl/certs/ca-certificates.crt' as TLS CA file." |
Date: |
Fri, 14 Aug 2015 07:30:54 +0000 |
iyzsong pushed a commit to branch master
in repository guix.
commit 8ff275687d76cfafe24c59349dfeb5f2bf9e236e
Author: 宋文武 <address@hidden>
Date: Fri Aug 14 15:29:16 2015 +0800
Revert "gnu: glib-networking: Use '/etc/ssl/certs/ca-certificates.crt' as
TLS CA file."
This broke libsoup tests.
This reverts commit af6100f51bf79efef0f79f90245790c410545513.
---
gnu/packages/gnome.scm | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fba5eeb..e510eb5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1876,7 +1876,8 @@ library.")
(build-system gnu-build-system)
(arguments
`(#:configure-flags
- '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
+ ;; FIXME: ca-certificates.crt is not available in the build environment.
+ '("--with-ca-certificates=no")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-giomoduledir
@@ -1885,16 +1886,7 @@ library.")
(substitute* "configure"
(("GIO_MODULE_DIR=.*")
(string-append "GIO_MODULE_DIR=" %output
- "/lib/gio/modules\n")))))
- (add-before 'check 'disable-failing-tls-tests
- ;; The tests 'file-database' and 'connection' fail due to
- ;; missing ca-certificates.crt in the build environment.
- (lambda _
- (substitute* "tls/tests/Makefile"
- (("TESTS = \\$\\(am__EXEEXT_3\\)")
- (string-append
- "TESTS = certificate$(EXEEXT) "
- "$(am__EXEEXT_1) $(am__EXEEXT_2)"))))))))
+ "/lib/gio/modules\n"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))