diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-17 17:24:24 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:56:57 +0200 |
commit | c69959f0545e5383a8caab53944c86abc5dfeeed (patch) | |
tree | 1e9e8d62b5becb550c04f67e35b6706339d5a103 /gnu | |
parent | 814e12dc87a191718374d811c0a3024d38dffcbb (diff) | |
download | patches-c69959f0545e5383a8caab53944c86abc5dfeeed.tar patches-c69959f0545e5383a8caab53944c86abc5dfeeed.tar.gz |
gnu: Replace uses of 'cmake' with 'cmake-minimal'.
This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which
introduced a new CMAKE-MINIMAL variant for use in package inputs.
* gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE
with CMAKE-MINIMAL.
* gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise.
* gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise.
* gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise.
* gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise.
* gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise.
* gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise.
* gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise.
* gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise.
* gnu/packages/video.scm (handbrake)[native-inputs]: Likewise.
* gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise.
* gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/databases.scm | 2 | ||||
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 2 | ||||
-rw-r--r-- | gnu/packages/firmware.scm | 2 | ||||
-rw-r--r-- | gnu/packages/games.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gnome.scm | 2 | ||||
-rw-r--r-- | gnu/packages/ibus.scm | 2 | ||||
-rw-r--r-- | gnu/packages/rust.scm | 2 | ||||
-rw-r--r-- | gnu/packages/simulation.scm | 2 | ||||
-rw-r--r-- | gnu/packages/squirrel.scm | 2 | ||||
-rw-r--r-- | gnu/packages/video.scm | 2 | ||||
-rw-r--r-- | gnu/packages/virtualization.scm | 2 | ||||
-rw-r--r-- | gnu/packages/vulkan.scm | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c38f6d2db7..f4966276a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3052,7 +3052,7 @@ algorithm implementations.") ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bf101ab31..176aa90eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3470,7 +3470,7 @@ to a key in your preferred mode.") (inputs `(("supercollider" ,supercollider))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (home-page "https://github.com/supercollider/scel") (synopsis "SuperCollider Emacs interface") (description "@code{emacs-scel} is an Emacs interface to SuperCollider. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90cb8845cf..8f0b6cb15e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -84,7 +84,7 @@ ;; Use our own tool chain for that. (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) ("cross-binutils" ,(cross-binutils "xtensa-elf")) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b177c0b2f0..8e8c6c8058 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4779,7 +4779,7 @@ fight against their plot and save his fellow rabbits from slavery.") ("zlib" ,zlib))) (native-inputs `(("boost" ,boost) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("mesa" ,mesa) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) @@ -5272,7 +5272,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) ("qttools" ,qttools))) (synopsis "Realistic physics puzzle game") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c455b2838..ab2bd4e3e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -299,7 +299,7 @@ features to enable users to create their discs easily and quickly.") ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake" ,cmake))) + ("cmake" ,cmake-minimal))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ Method Engine.") ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 43725c64ce..f90bc52506 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,7 @@ test = { path = \"../libtest\" } (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests ("procps" ,procps) ; For the tests diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a8d214794e..edc8d6e190 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -620,7 +620,7 @@ user interface to the FEniCS core components and external libraries.") ("python-matplotlib" ,python-matplotlib) ,@(alist-delete "python" (package-inputs fenics-dolfin)))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 2c3ed6e570..1b9489882f 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -71,7 +71,7 @@ (find-files "../squirrel3/include"))) #t))))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) (home-page "https://squirrel-lang.org/") (synopsis "High level imperative, object-oriented programming language") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc6d2fb9b4..9859c55f98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2604,7 +2604,7 @@ supported players in addition to this package.") (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) - ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py + ("cmake" ,cmake-minimal) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87839490b2..303171e61d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1291,7 +1291,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (native-inputs `(("dev86" ,dev86) ("bison" ,bison) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("figlet" ,figlet) ("flex" ,flex) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ API.") `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) |