From 9fe0131904865d454a9c6b3af231a1bb47228b7a Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Mon, 29 Aug 2022 12:56:16 +0200
Subject: 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.
---
 gnu/packages/curl.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gnu/packages')

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 @@ (define-public curl
    (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 @@ (define-public curl
     `(#: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 @@ (define-public curl-ssh
        ((#: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
-- 
cgit v1.2.3