treewide: move cmake into nativeBuildInputs

This commit is contained in:
Ben Siraphob 2022-03-30 16:35:38 -05:00
parent 9cd1fa9bce
commit 4c38fcb192
No known key found for this signature in database
GPG Key ID: 45F0E5D788143267
11 changed files with 17 additions and 12 deletions

View File

@ -54,9 +54,9 @@ in
mkDerivation rec { mkDerivation rec {
inherit pname version src; inherit pname version src;
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
bash bash
cmake
pkg-config pkg-config
qtbase qtbase
qwt qwt

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq";
}; };
nativeBuildInputs = [ pkg-config wrapGAppsHook ]; nativeBuildInputs = [ pkg-config wrapGAppsHook cmake ];
buildInputs = [ buildInputs = [
dbus dbus
openssl openssl
@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
libepoxy libepoxy
boost boost
libXdmcp libXdmcp
cmake
aspell aspell
libgit2 libgit2
libxkbcommon libxkbcommon

View File

@ -173,9 +173,9 @@ self: super: {
}); });
cpsm = super.cpsm.overrideAttrs (old: { cpsm = super.cpsm.overrideAttrs (old: {
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
python3 python3
cmake
boost boost
icu icu
ncurses ncurses

View File

@ -31,9 +31,10 @@ stdenv.mkDerivation rec {
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
rsync rsync
cmake lua pkg-config lua pkg-config
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
]; ];

View File

@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0=";
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor 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 libXxf86vm openal libGLU libGL
libjpeg flac libjpeg flac
libXi libXfixes libXi libXfixes

View File

@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
./encoding.patch ./encoding.patch
]; ];
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor 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 libXxf86vm openal libGLU libGL
]; ];

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8";
}; };
buildInputs = [ xercesc getopt cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ xercesc getopt ];
meta = { meta = {
homepage = "https://xalan.apache.org/"; homepage = "https://xalan.apache.org/";

View File

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake rocm-cmake rocm-runtime ]; nativeBuildInputs = [ cmake ];
buildInputs = [ rocm-cmake rocm-runtime ];
cmakeFlags = [ cmakeFlags = [
"-DROCM_DIR=${rocm-runtime}" "-DROCM_DIR=${rocm-runtime}"
"-DROCRTST_BLD_TYPE=Release" "-DROCRTST_BLD_TYPE=Release"

View File

@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
SDL2 SDL2
cmake
makeWrapper makeWrapper
]; ];

View File

@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
SDL2 SDL2
SDL2_mixer SDL2_mixer
cmake
makeWrapper makeWrapper
Cocoa Cocoa
]; ];

View File

@ -13,8 +13,9 @@ mkDerivation rec {
postPatch = "sed '1i#include <vector>' -i src/model/World.h"; postPatch = "sed '1i#include <vector>' -i src/model/World.h";
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which
gettext gettext
]; ];