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