~ruther/guix-local

b09c302a20d7a108dc55031089e02cd70729b771 — Greg Hogan 1 year, 2 months ago 5873967
gnu: Use default cmake.

* gnu/packages/audio.scm (redumper),
* gnu/packages/cpp.scm (hyprgraphics),
* gnu/packages/databases.scm (apache-arrow),
* gnu/packages/emulators.scm (ares),
* gnu/packages/games.scm (gemrb),
* gnu/packages/image-viewers.scm (vv),
* gnu/packages/machine-learning.scm (fbgemm),
* gnu/packages/messaging.scm (libqmatrixclient),
* gnu/packages/music.scm (ctrlr),
* gnu/packages/video.scm (obs),
* gnu/packages/vulkan.scm (glslang),
* gnu/packages/wm.scm (hyprland),
* gnu/packages/xdisorg.scm (aquamarine, hyprlock, hyprpaper, hyprsunset)
[arguments]<#:cmake>: Delete.

* gnu/packages/python-compression.scm (python-deflate):
[native-inputs]: Replace cmake-next with cmake-minimal.

Change-Id: I5b021d7e1e807922425d8f58692b032485603770
M gnu/packages/audio.scm => gnu/packages/audio.scm +0 -1
@@ 4329,7 4329,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.

M gnu/packages/cpp.scm => gnu/packages/cpp.scm +0 -1
@@ 928,7 928,6 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.")
                "0q7bpywn8ljsj3dymvv19cm7n0r51vg5hj1jsapdl5bwpwf7bf41"))))
    (build-system cmake-build-system)
    (native-inputs (list gcc-15 pkg-config))
    (arguments (list #:cmake cmake-next))
    (inputs (list cairo
                  hyprutils
                  libjpeg-turbo

M gnu/packages/databases.scm => gnu/packages/databases.scm +0 -1
@@ 5185,7 5185,6 @@ with integrated support for finding required rows quickly.")
    (build-system cmake-build-system)
    (arguments
     (list
      #:cmake cmake ;needs 3.25+
      #:tests? #f
      #:phases
      #~(modify-phases %standard-phases

M gnu/packages/emulators.scm => gnu/packages/emulators.scm +0 -1
@@ 147,7 147,6 @@
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ; No tests
           #:cmake cmake-next           ; Requires cmake >= 3.28
           #:configure-flags
           #~(list "-DARES_BUILD_LOCAL=FALSE"
                   "-DARES_BUILD_OFFICIAL=TRUE"

M gnu/packages/games.scm => gnu/packages/games.scm +0 -1
@@ 13501,7 13501,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))

M gnu/packages/image-viewers.scm => gnu/packages/image-viewers.scm +0 -1
@@ 1292,7 1292,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"

M gnu/packages/machine-learning.scm => gnu/packages/machine-learning.scm +0 -1
@@ 4819,7 4819,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

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +0 -1
@@ 2402,7 2402,6 @@ notifications, and Python scripting support.")
     (list olm openssl qtkeychain-qt6 qtmultimedia))
    (arguments
     (list #:qtbase qtbase
           #:cmake cmake-next
           #:configure-flags
           #~(list "-DBUILD_TESTING=ON"
                   "-DBUILD_SHARED_LIBS=ON")

M gnu/packages/music.scm => gnu/packages/music.scm +0 -1
@@ 627,7 627,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

M gnu/packages/python-compression.scm => gnu/packages/python-compression.scm +1 -2
@@ 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}")

M gnu/packages/video.scm => gnu/packages/video.scm +0 -1
@@ 4151,7 4151,6 @@ be used for realtime video capture via Linux-specific APIs.")
    (build-system cmake-build-system)
    (arguments
     (list
      #:cmake cmake-next                ;needs cmake >= 3.28
      #:tests? #f
      #:configure-flags
      #~(let ((libdir (string-append (assoc-ref %outputs "out") "/lib")))

M gnu/packages/vulkan.scm => gnu/packages/vulkan.scm +1 -2
@@ 225,8 225,7 @@ translation between LLVM IR and SPIR-V.")
       (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
     `(#:cmake ,cmake-minimal-3.30
       #:configure-flags '("-DBUILD_SHARED_LIBS=ON"
     `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"
                           "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON"
                           ,@(if (target-riscv64?)
                                 `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")

M gnu/packages/wm.scm => gnu/packages/wm.scm +1 -2
@@ 393,8 393,7 @@ loginctl commands (lock/unlock/before-sleep) and inhibit.")
                "0mn97wlzc5ccywbq87ka7a27jajkdkgypkfzkcan014viph80wif"))))
    (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

M gnu/packages/xdisorg.scm => gnu/packages/xdisorg.scm +4 -10
@@ 261,8 261,7 @@ command line, without displaying a keyboard at all.")
                "0cwbd9cdbg40frhircwfbaxdqh11s8jqq9dqy228j9zvb27y2b72"))))
    (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-15 hyprwayland-scanner pkg-config))


@@ 3944,9 3943,7 @@ This package is the fork of hsetroot by Hyriand.")
        (base32 "0h0iibncjl780nnwvf1mfmqckdzzc4b4fphflj4mq56nswf697ha"))))
    (build-system cmake-build-system)
    (arguments
     (list
      #:cmake cmake-next
      #:tests? #f)) ;No tests.
     (list #:tests? #f)) ;No tests.
    (native-inputs
     (list gcc-15
           pkg-config))


@@ 3984,8 3981,7 @@ reduce percieved brightness below the monitor's minimum.")
      (base32 "1f0vcp0c9d3m9v3avajprpv14khnv3wk3y9fi3pcwr5xf2alaxv2"))))
   (build-system cmake-build-system)
   (arguments
    `(#:cmake ,cmake-next
      #:phases
    `(#:phases
      (modify-phases %standard-phases
                     ;; remove when fixed
                     (add-after 'unpack 'fixgldiscover


@@ 4034,9 4030,7 @@ GPU-accelerated screen locking utility.")
             (base32
              "0j3hbqfx40cjxkvaiqzfij8pgblg2hyv9lbbjjh4iahciwgh7623"))))
   (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