gnu: cURL: Use G-expression.

...and reindent.

* gnu/packages/curl.scm (curl)[arguments]: Convert to G-expression.
(curl-ssh)[arguments]: Likewise.
This commit is contained in:
Marius Bakke 2022-08-29 13:00:56 +02:00
parent 9fe0131904
commit 0877f66987
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -93,16 +93,17 @@
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))))
(arguments
`(#:disallowed-references ("doc")
#:configure-flags (list "--with-gnutls"
(list
#:disallowed-references '("doc")
#:configure-flags
#~(list "--with-gnutls"
(string-append "--with-gssapi="
(dirname (dirname
(search-input-file
%build-inputs
"lib/libgssrpc.so"))))
%build-inputs "lib/libgssrpc.so"))))
"--disable-static")
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'unpack 'tweak-lib3026-test
(lambda _
;; Have that test create a hundred threads, not a thousand.
@ -115,15 +116,12 @@
(substitute* "curl-config.in"
(("@CONFIGURE_OPTIONS@")
"\"not available\""))))
(add-after
'install 'move-man3-pages
(lambda* (#:key outputs #:allow-other-keys)
(add-after 'install 'move-man3-pages
(lambda _
;; Move section 3 man pages to "doc".
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share/man"))
(rename-file (string-append out "/share/man/man3")
(string-append doc "/share/man/man3")))))
(mkdir-p (string-append #$output:doc "/share/man"))
(rename-file (string-append #$output "/share/man/man3")
(string-append #$output:doc "/share/man/man3"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(substitute* "tests/runtests.pl"
@ -155,7 +153,7 @@ tunneling, and so on.")
(arguments
(substitute-keyword-arguments (package-arguments curl)
((#:configure-flags flags)
`(cons "--with-libssh2" ,flags))))
#~(cons "--with-libssh2" #$flags))))
(inputs
(modify-inputs (package-inputs curl)
(prepend libssh2)))