oom pushed a commit to branch c++-team
in repository guix.
commit 81da6f52a08ceebc5cd025350cb16e8762c0f6e9
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Sat Mar 8 20:05:32 2025 +0000
gnu: Use default cmake.
* gnu/packages/audio.scm (redumper),
* gnu/packages/cpp.scm (hyprgraphics),
* gnu/packages/games.scm (gemrb),
* gnu/packages/image-viewers.scm (vv),
* gnu/packages/machine-learning.scm (fbgemm),
* gnu/packages/music.scm (ctrlr),
* gnu/packages/python-compression.scm (python-deflate),
* gnu/packages/wm.scm (hyprland),
* gnu/packages/xdisorg.scm (aquamarine, hyprlock, hyprpaper)
[arguments]<#:cmake>: Delete.
Change-Id: I5b021d7e1e807922425d8f58692b032485603770
---
gnu/packages/audio.scm | 1 -
gnu/packages/cpp.scm | 1 -
gnu/packages/games.scm | 1 -
gnu/packages/image-viewers.scm | 1 -
gnu/packages/machine-learning.scm | 1 -
gnu/packages/music.scm | 1 -
gnu/packages/python-compression.scm | 3 +--
gnu/packages/wm.scm | 3 +--
gnu/packages/xdisorg.scm | 10 +++-------
9 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 0d332e68f8..ec98780846 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4130,7 +4130,6 @@ using Guix System.")
(build-system cmake-build-system)
(arguments
(list
- #:cmake cmake-next
#:build-type "Release"
;; The build system uses CMake modules features that are only available
;; when using Ninja.
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index b0f83d2c37..847c31b3fd 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -897,7 +897,6 @@ library for SIMD (Single Instruction, Multiple Data) with
runtime dispatch.")
"14yfb8vl1bbldlv12cg3dhd6z9bdaxvlz7kx671dqpi9m8j3kd56"))))
(build-system cmake-build-system)
(native-inputs (list gcc-14 pkg-config))
- (arguments (list #:cmake cmake-next))
(inputs (list cairo
hyprutils
libjpeg-turbo
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index cc910479b7..b9cbcded0b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12816,7 +12816,6 @@ virtual reality devices.")
(build-system cmake-build-system)
(arguments
(list
- #:cmake cmake-next
#:configure-flags
#~(list "-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL")))
(native-inputs (list python-3.10 glibc-locales googletest))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 3700b757a8..299fccec38 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1286,7 +1286,6 @@ any user may run. Everything is free and privacy is the
first concern.")
(build-system cmake-build-system)
(arguments
(list #:tests? #f ; no tests.
- #:cmake cmake-next
#:configure-flags
#~ (list "-DMARCH_NATIVE=OFF"
"-DCMAKE_BUILD_TYPE=Release"
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 2338821f05..9f91d639cf 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4717,7 +4717,6 @@ TensorFlow.js, PyTorch, and MediaPipe.")
(build-system cmake-build-system)
(arguments
(list
- #:cmake cmake-next
#:configure-flags
''("-DFBGEMM_LIBRARY_TYPE=shared")
;; Tests require AVX2 or AVX-512 instructions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 00429e54e2..ea6698fda4 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -624,7 +624,6 @@ playing your music.")
(build-system cmake-build-system)
(arguments
(list
- #:cmake cmake ;needs 3.25
#:tests? #false ;there are none
#:phases
#~(modify-phases %standard-phases
diff --git a/gnu/packages/python-compression.scm
b/gnu/packages/python-compression.scm
index 683afae035..4361c0b65e 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -835,8 +835,7 @@ wrapper. It provides a backport of the @code{Path}
object.")
(lambda _
(setenv "LIBDEFLATE_PREFIX"
#$(this-package-input "libdeflate")))))))
- ;; CMake >= 3.26 required.
- (native-inputs (list cmake-next python-pytest python-scikit-build-core))
+ (native-inputs (list cmake-minimal python-pytest python-scikit-build-core))
(inputs (list libdeflate))
(home-page "https://github.com/dcwatson/deflate";)
(synopsis "Python wrapper for @code{libdeflate}")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 67a380ca0b..f7e184d2f6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -386,8 +386,7 @@ commands (lock/unlock/before-sleep) and inhibit.")
"19ip27hzaj2j2idaz33ypcslawkp9v5vpjx1gcm6ypqsip1s01h1"))))
(build-system cmake-build-system)
(arguments
- (list #:cmake cmake-next
- #:tests? #f ;No tests.
+ (list #:tests? #f ;No tests.
#:configure-flags #~'("-DNO_HYPRPM=True")
#:phases
#~(modify-phases %standard-phases
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d8c6be80fe..28d6786069 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -257,8 +257,7 @@ command line, without displaying a keyboard at all.")
"01lmzmb5bzphichbyim7iy04405af5mqcqf8ki3if4wdxkdmbfn9"))))
(build-system cmake-build-system)
(arguments
- (list #:cmake cmake-next
- ;; TODO: Figure out what's expected in the test environment.
+ (list ;; TODO: Figure out what's expected in the test environment.
#:tests? #f))
(native-inputs
(list gcc-14 hyprwayland-scanner pkg-config))
@@ -3843,8 +3842,7 @@ This package is the fork of hsetroot by Hyriand.")
(base32 "03ivr5nsjwiwvpdxpjnldwawy8sx8qgwhs57242xkb0zz0w0gvsk"))))
(build-system cmake-build-system)
(arguments
- `(#:cmake ,cmake-next
- #:phases
+ `(#:phases
(modify-phases %standard-phases
;; remove when fixed
(add-after 'unpack 'fixgldiscover
@@ -3893,9 +3891,7 @@ GPU-accelerated screen locking utility.")
(base32
"151r6s04yy3digl3g6gs49xx41yv4xldmbnqr87gp5nz705hjsd6"))))
(build-system cmake-build-system)
- (arguments
- `(#:tests? #f ;; no test
- #:cmake ,cmake-next))
+ (arguments '(#:tests? #f)) ;; no test
(native-inputs (list gcc-14 pkg-config))
(inputs
(list cairo
