mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: glib-networking: Use '/etc/ssl/certs/ca-certificates.crt' as TLS CA file.
* gnu/packages/gnome.scm (glib-networking)[arguments]: Pass '--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt' to configure. Add 'disable-failing-tls-tests' phase.
This commit is contained in:
parent
f6a9bf848f
commit
af6100f51b
1 changed files with 11 additions and 3 deletions
|
@ -1876,8 +1876,7 @@ (define-public glib-networking
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; FIXME: ca-certificates.crt is not available in the build environment.
|
||||
'("--with-ca-certificates=no")
|
||||
'("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-giomoduledir
|
||||
|
@ -1886,7 +1885,16 @@ (define-public glib-networking
|
|||
(substitute* "configure"
|
||||
(("GIO_MODULE_DIR=.*")
|
||||
(string-append "GIO_MODULE_DIR=" %output
|
||||
"/lib/gio/modules\n"))))))))
|
||||
"/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)"))))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)))
|
||||
|
|
Loading…
Reference in a new issue