[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/15: gnu: CMake: Remove input labels.
From: |
guix-commits |
Subject: |
13/15: gnu: CMake: Remove input labels. |
Date: |
Mon, 27 Jun 2022 17:50:03 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6cd881401112b1dae524aeb200283e07a7a26c68
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jun 27 21:38:53 2022 +0200
gnu: CMake: Remove input labels.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove labels.
(cmake)[native-inputs]: Likewise. Use MODIFY-INPUTS.
---
gnu/packages/cmake.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index b581217685..4fb74a7c51 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -213,17 +213,18 @@ using the CMake build system.")
(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 @@ and workspaces that can be used in the compiler environment
of your choice.")
)))
;; 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)))))
- branch core-updates updated (1e39cc6481 -> 0b0750e831), guix-commits, 2022/06/27
- 01/15: gnu: ruby-sqlite3: Update to 1.4.4., guix-commits, 2022/06/27
- 03/15: gnu: python-libxml2: Move definition closer to its inherited origin., guix-commits, 2022/06/27
- 04/15: gnu: python-libxml2: Remove input labels., guix-commits, 2022/06/27
- 09/15: gnu: doxygen: Use new style., guix-commits, 2022/06/27
- 12/15: gnu: libjpeg-turbo: Build with cmake-minimal., guix-commits, 2022/06/27
- 05/15: gnu: icu4c: Update to 71.1., guix-commits, 2022/06/27
- 07/15: gnu: harfbuzz: Remove input labels., guix-commits, 2022/06/27
- 13/15: gnu: CMake: Remove input labels.,
guix-commits <=
- 15/15: gnu: CMake: Update to 3.23.2., guix-commits, 2022/06/27
- 10/15: gnu: jsoncpp: Build with Meson., guix-commits, 2022/06/27
- 14/15: gnu: CMake: Use G-expressions., guix-commits, 2022/06/27
- 02/15: gnu: python-libxml2: Fix build failure., guix-commits, 2022/06/27
- 06/15: gnu: harfbuzz: Update to 4.3.0., guix-commits, 2022/06/27
- 11/15: gnu: CMake: Bootstrap with system jsoncpp., guix-commits, 2022/06/27
- 08/15: gnu: doxygen: Update to 1.9.4., guix-commits, 2022/06/27