treewide: move extra-cmake-modules to nativeBuildInputs

it's a dependency only for build time, not run time.
the majority of packages place this in nativeBuildInputs,
these few were outliars.
This commit is contained in:
Colin
2025-04-19 06:57:59 +00:00
parent eb4231f3f0
commit 5cdef1a5bf
16 changed files with 27 additions and 28 deletions

View File

@@ -60,6 +60,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
wrapQtAppsHook
];
@@ -71,7 +72,6 @@ stdenv.mkDerivation {
python3
python3.pkgs.pyside2
python3.pkgs.shiboken2
extra-cmake-modules
wayland
glog
ceres-solver

View File

@@ -46,6 +46,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
ninja
pkg-config
qttools
@@ -57,7 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
SDL2
cpuinfo
curl
extra-cmake-modules
libXrandr
libbacktrace
libwebp

View File

@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
extra-cmake-modules
fcitx5
fmt
gtest

View File

@@ -3,7 +3,7 @@
fetchFromGitLab,
stdenv,
cmake,
kdePackages,
extra-cmake-modules,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -18,10 +18,12 @@ stdenv.mkDerivation {
hash = "sha256-/ZEja+iDx0lVkJaLshPd1tZD4ZUspVeFHY1TNXjr4qg=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kdePackages.extra-cmake-modules
libsForQt5.qtbase
];

View File

@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
wrapQtAppsHook
];
@@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
[
SDL2
enet
extra-cmake-modules
libarchive
libslirp
libGL

View File

@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs =
[
cmake
extra-cmake-modules
doxygen
graphviz
perl
@@ -53,16 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
wrapQtAppsHook
]);
buildInputs =
[
extra-cmake-modules
]
++ (with libsForQt5; [
kcalendarcore
qtbase
qtpim
timed
]);
buildInputs = with libsForQt5; [
kcalendarcore
qtbase
qtpim
timed
];
nativeCheckInputs = [
tzdata

View File

@@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
ninja
qt6.wrapQtAppsHook
];
buildInputs = [
qt6.qtdeclarative
extra-cmake-modules
];
meta = with lib; {

View File

@@ -54,6 +54,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
strip-nondeterminism
wrapQtAppsHook
@@ -62,7 +63,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
buildInputs = [
curl
extra-cmake-modules
ffmpeg
libaio
libbacktrace

View File

@@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
qt6Packages.wrapQtAppsHook
];
@@ -36,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs =
[
exiv2
extra-cmake-modules
imagemagick
libarchive
libdevil

View File

@@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
];
buildInputs =
[
extra-cmake-modules
mkcal
]
++ (with libsForQt5; [

View File

@@ -30,12 +30,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
wayland-scanner
];
buildInputs = [
extra-cmake-modules
glfw3
libX11
libXau

View File

@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
extra-cmake-modules
xorgproto
uthash
];
buildInputs = [
extra-cmake-modules
xcbutil
xcbutilkeysyms
];

View File

@@ -20,13 +20,15 @@ mkDerivation {
};
buildInputs = [
extra-cmake-modules
qtbase
boost
];
propagatedBuildInputs = [ gpgme ];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
meta = with lib; {
license = [ licenses.lgpl2 ];

View File

@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
buildInputs = [
qtbase
qttools
extra-cmake-modules
polkit-qt
];

View File

@@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
extra-cmake-modules # required to please CMake
expat
fmt
isocodes

View File

@@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
extra-cmake-modules
gettext
go
];
buildInputs = [
fcitx5
extra-cmake-modules
];
preConfigure = ''