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

8ff275687d76cfafe24c59349dfeb5f2bf9e236e — 宋文武 10 years ago 1cdecaf

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

This broke libsoup tests.

This reverts commit af6100f51bf79efef0f79f90245790c410545513.

patch browse .tar.gz

1 files changed, 3 insertions(+), 11 deletions(-)

M gnu/packages/gnome.scm

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +3 -11

@@ 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)))