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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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