ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: glib-networking: Use '/etc/ssl/certs/ca-certificates.crt' as TLS CA file."

Browse source 
This broke libsoup tests.

This reverts commit af6100f51b.
This commit is contained in:
宋文武 2015-08-14 15:29:16 +08:00
parent 1cdecaf5e6
commit 8ff275687d
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/gnome.scm
View file

@ -1876,7 +1876,8 @@ (define-public glib-networking
(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 @@ (define-public glib-networking
(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)))