From 4c38fcb192a471611ff205af35992451a73a7a33 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 30 Mar 2022 16:35:38 -0500 Subject: [PATCH] treewide: move cmake into nativeBuildInputs --- pkgs/applications/audio/sonic-pi/default.nix | 2 +- pkgs/applications/editors/jucipp/default.nix | 3 +-- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- pkgs/applications/networking/sync/lsyncd/default.nix | 3 ++- pkgs/development/libraries/allegro/5.nix | 3 ++- pkgs/development/libraries/allegro/default.nix | 3 ++- pkgs/development/libraries/xalanc/default.nix | 3 ++- pkgs/development/tools/rocminfo/default.nix | 3 ++- pkgs/games/nanosaur/default.nix | 2 +- pkgs/games/space-cadet-pinball/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 3 ++- 11 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index e9d8f979e4ad..b41bea58453c 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -54,9 +54,9 @@ in mkDerivation rec { inherit pname version src; + nativeBuildInputs = [ cmake ]; buildInputs = [ bash - cmake pkg-config qtbase qwt diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 7a57e2171095..b06c93c10340 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook cmake ]; buildInputs = [ dbus openssl @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { libepoxy boost libXdmcp - cmake aspell libgit2 libxkbcommon diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3738e1c3aa15..8b55c1706939 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -173,9 +173,9 @@ self: super: { }); cpsm = super.cpsm.overrideAttrs (old: { + nativeBuildInputs = [ cmake ]; buildInputs = [ python3 - cmake boost icu ncurses diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 4c95a35ab85a..7690bf6ee540 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -31,9 +31,10 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ rsync - cmake lua pkg-config + lua pkg-config asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 380cc1f7198e..859d46459cb8 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor - alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 6abf632806a4..d9c862443653 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ./encoding.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor - alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index b750b26996d5..2b5f2379fde7 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; }; - buildInputs = [ xercesc getopt cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ xercesc getopt ]; meta = { homepage = "https://xalan.apache.org/"; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 60ca0a51d265..d399a912b5ff 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ cmake rocm-cmake rocm-runtime ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ rocm-cmake rocm-runtime ]; cmakeFlags = [ "-DROCM_DIR=${rocm-runtime}" "-DROCRTST_BLD_TYPE=Release" diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index d5ebee755da6..75e47fa179b9 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 - cmake makeWrapper ]; diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix index 31df5377f1d3..3aed29adfd74 100644 --- a/pkgs/games/space-cadet-pinball/default.nix +++ b/pkgs/games/space-cadet-pinball/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_mixer - cmake makeWrapper Cocoa ]; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index f5330485eddc..cc753783f035 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -13,8 +13,9 @@ mkDerivation rec { postPatch = "sed '1i#include ' -i src/model/World.h"; + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake + qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which gettext ];