nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libsoup: Update to 2.58.1. 

* gnu/packages/gnome.scm (libsoup): Update to 2.58.1.
[arguments]<#:configure-flags>: Specify HTTPD module directory.
[arguments]<#:phases>: Don't load mod_mpm_prefork for tests.
This commit is contained in:
Marius Bakke 2017-05-24 19:37:21 +02:00
parent 6d836f4d83
commit ffaf5cbd36
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gnome.scm
View File

@ -2242,7 +2242,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup (define-public libsoup
(package (package
(name "libsoup") (name "libsoup")
(version "2.56.0") (version "2.58.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/" (uri (string-append "mirror://gnome/sources/libsoup/"
@ -2250,14 +2250,17 @@ libxml to ease remote use of the RESTful API.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1r8zz270qdg92gbsvy61d51y1cj7hp059h2f4xpvqiw2vrqnn8fq")))) "1fggmshk2mfsyfvml6paki65xj9rv1s5p7ds41xmnx6yazsnkik2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-html-dir=" (list (string-append "--with-html-dir="
(assoc-ref %outputs "doc") (assoc-ref %outputs "doc")
"/share/gtk-doc/html")) "/share/gtk-doc/html")
(string-append "--with-apache-module-dir="
(assoc-ref %build-inputs "httpd")
"/modules"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'disable-unconnected-socket-test (add-before 'configure 'disable-unconnected-socket-test
@ -2275,6 +2278,9 @@ libxml to ease remote use of the RESTful API.")
;; The ca-certificates.crt is not available in the build ;; The ca-certificates.crt is not available in the build
;; environment. ;; environment.
(setenv "SSL_CERT_FILE" "/dev/null") (setenv "SSL_CERT_FILE" "/dev/null")
;; HTTPD in Guix uses mod_event and does not build prefork.
(substitute* "tests/httpd.conf"
(("^LoadModule mpm_prefork_module.*$") "\n"))
#t)) #t))
(replace 'install (replace 'install
(lambda _ (lambda _