gnu: CMake: Remove input labels.

* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove labels.
(cmake)[native-inputs]: Likewise.  Use MODIFY-INPUTS.
This commit is contained in:
Marius Bakke 2022-06-27 21:38:53 +02:00
parent 02f7c56ec4
commit 6cd8814011
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -213,17 +213,18 @@ (define-public cmake-bootstrap
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
(inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
("expat" ,expat)
("file" ,file)
("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
,@(if (hurd-target?)
'()
`(("libuv" ,libuv))) ;not supported on the Hurd
("rhash" ,rhash)
("zlib" ,zlib)))
(append
(if (hurd-target?)
'()
(list libuv)) ;not supported on the Hurd
(list bzip2
curl
expat
file
jsoncpp
libarchive
rhash
zlib)))
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
@ -369,9 +370,8 @@ (define-public cmake
)))
;; Extra inputs required to build the documentation.
(native-inputs
`(,@(package-native-inputs cmake-minimal)
("python-sphinx" ,python-sphinx)
("texinfo" ,texinfo)))
(modify-inputs (package-native-inputs cmake-minimal)
(append python-sphinx texinfo)))
(outputs '("out" "doc"))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))