gnu: nghttp2: Remove input labels.

* gnu/packages/web.scm (nghttp2)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-DIRECTORY.
This commit is contained in:
Marius Bakke 2022-06-26 02:41:18 +02:00
parent 1d3aedf18c
commit 3ab568573e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -7505,16 +7505,15 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
cunit python tzdata-for-tests)) cunit python tzdata-for-tests))
(inputs (inputs
;; Required to build the tools (i.e. without --enable-lib-only). ;; Required to build the tools (i.e. without --enable-lib-only).
`(("c-ares" ,c-ares) (append
("jansson" ,jansson) ; for HPACK tools (if (hurd-target?)
,@(if (hurd-target?) '() `(,openssl "static")
`(("jemalloc" ,jemalloc))) ; fight nghttpd{,x} heap fragmentation (list jemalloc)) ; fight nghttpd{,x} heap fragmentation
("libev" ,libev) (list c-ares
("libxml2" ,libxml2) ; for nghttp -a jansson ; for HPACK tools
("openssl" ,openssl) libev
,@(if (hurd-target?) libxml2 ; for nghttp -a
`(("openssl-static" ,openssl "static")) openssl)))
'())))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib") (list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib")
@ -7539,10 +7538,9 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
#t)) #t))
(add-before 'check 'set-timezone-directory (add-before 'check 'set-timezone-directory
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (setenv "TZDIR" (search-input-directory
(assoc-ref (or native-inputs inputs) "tzdata") (or native-inputs inputs)
"/share/zoneinfo")) "share/zoneinfo")))))))
#t)))))
(home-page "https://nghttp2.org/") (home-page "https://nghttp2.org/")
(synopsis "HTTP/2 protocol client, proxy, server, and library") (synopsis "HTTP/2 protocol client, proxy, server, and library")
(description (description