diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-29 12:56:16 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-30 20:43:02 +0200 |
| commit | 9fe0131904865d454a9c6b3af231a1bb47228b7a (patch) | |
| tree | 5bbed9b63f36a428c218a5373feb474d6e3ffdc3 /gnu/packages/curl.scm | |
| parent | 7e329b8a4a9bea8cfe0f0d8e6a5551ac08ebcbfb (diff) | |
| download | guix-9fe0131904865d454a9c6b3af231a1bb47228b7a.tar.gz | |
gnu: cURL: Remove input labels.
* gnu/packages/curl.scm (curl)[native-inputs]: Remove labels. [arguments]: Use SEARCH-INPUT-FILE instead of label. (curl-ssh)[inputs]: Use MODIFY-INPUTS.
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 6afc870b41..b758700d76 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -76,13 +76,10 @@ (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages - (inputs (list gnutls libidn mit-krb5 - `(,nghttp2 "lib") zlib)) + (inputs + (list gnutls libidn mit-krb5 `(,nghttp2 "lib") zlib)) (native-inputs - `(("nghttp2" ,nghttp2) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper))) + (list nghttp2 perl pkg-config python-minimal-wrapper)) (native-search-paths ;; These variables are introduced by curl-use-ssl-cert-env.patch. (list $SSL_CERT_DIR @@ -99,7 +96,10 @@ `(#:disallowed-references ("doc") #:configure-flags (list "--with-gnutls" (string-append "--with-gssapi=" - (assoc-ref %build-inputs "mit-krb5")) + (dirname (dirname + (search-input-file + %build-inputs + "lib/libgssrpc.so")))) "--disable-static") #:phases (modify-phases %standard-phases @@ -157,8 +157,8 @@ tunneling, and so on.") ((#:configure-flags flags) `(cons "--with-libssh2" ,flags)))) (inputs - `(("libssh2" ,libssh2) - ,@(package-inputs curl))) + (modify-inputs (package-inputs curl) + (prepend libssh2))) (properties `((hidden? . #t))))) (define-public kurly |