treewide: move cmake into nativeBuildInputs
This commit is contained in:
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
@@ -46,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
eigen
|
||||
glm
|
||||
gtkmm4
|
||||
|
||||
@@ -23,11 +23,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-PA7Hvn+vYBD80thkIamwOhw4lJWAmU/TQBnwJro4r7c=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
cmake
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -23,8 +23,8 @@ llvmPackages.stdenv.mkDerivation rec {
|
||||
llvm = llvmPackages.llvm;
|
||||
clang = llvmPackages.clang-unwrapped;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
cmake
|
||||
git
|
||||
llvm
|
||||
clang
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
fetchFromGitLab,
|
||||
rustPlatform,
|
||||
symlinkJoin,
|
||||
|
||||
# nativeBuildInputs
|
||||
blueprint-compiler,
|
||||
cargo,
|
||||
@@ -18,7 +17,6 @@
|
||||
python3,
|
||||
rustc,
|
||||
wrapGAppsHook4,
|
||||
|
||||
# buildInputs
|
||||
appstream-glib,
|
||||
cairo,
|
||||
@@ -37,12 +35,10 @@
|
||||
sqlite,
|
||||
udev,
|
||||
wayland,
|
||||
|
||||
# magpie wrapper
|
||||
addDriverRunpath,
|
||||
libGL,
|
||||
vulkan-loader,
|
||||
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -129,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
addDriverRunpath
|
||||
blueprint-compiler
|
||||
cargo
|
||||
@@ -149,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
appstream-glib
|
||||
blueprint-compiler
|
||||
cairo
|
||||
cmake
|
||||
dbus
|
||||
desktop-file-utils
|
||||
gdk-pixbuf
|
||||
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
cmake
|
||||
onetbb
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user