From 3f200cf2f5b2e4202b55f2e39f7c9c8bb847f41e Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 19 Jun 2025 14:44:31 +0300 Subject: [PATCH] Revert "kdePackages.extra-cmake-modules: propagate qdoc by default" This reverts commit 618789b27f061672d1a3b4897d41b2d44869575a. --- pkgs/by-name/di/digikam/package.nix | 5 ----- .../frameworks/extra-cmake-modules/default.nix | 8 ++------ pkgs/kde/frameworks/karchive/default.nix | 6 +++++- pkgs/kde/frameworks/kauth/default.nix | 7 ++++++- pkgs/kde/frameworks/kbookmarks/default.nix | 7 ++++++- pkgs/kde/frameworks/kcodecs/default.nix | 2 ++ pkgs/kde/frameworks/kcompletion/default.nix | 7 ++++++- pkgs/kde/frameworks/kconfig/default.nix | 2 ++ pkgs/kde/frameworks/kcoreaddons/default.nix | 2 ++ pkgs/kde/frameworks/kdbusaddons/default.nix | 7 ++++++- pkgs/kde/frameworks/kdnssd/default.nix | 2 ++ pkgs/kde/frameworks/kglobalaccel/default.nix | 7 ++++++- pkgs/kde/frameworks/kholidays/default.nix | 2 ++ pkgs/kde/frameworks/kirigami/default.nix | 8 +++++--- pkgs/kde/frameworks/kitemviews/default.nix | 7 ++++++- pkgs/kde/frameworks/kjobwidgets/default.nix | 7 ++++++- pkgs/kde/frameworks/knotifications/default.nix | 2 ++ .../frameworks/kstatusnotifieritem/default.nix | 7 ++++++- pkgs/kde/frameworks/ktexteditor/default.nix | 2 -- pkgs/kde/frameworks/ktextwidgets/default.nix | 2 -- pkgs/kde/frameworks/kuserfeedback/default.nix | 6 +++++- pkgs/kde/frameworks/kwidgetsaddons/default.nix | 7 ++++++- pkgs/kde/frameworks/kwindowsystem/default.nix | 2 ++ pkgs/kde/frameworks/prison/default.nix | 4 +--- .../frameworks/qqc2-desktop-style/default.nix | 2 ++ pkgs/kde/frameworks/solid/default.nix | 2 ++ pkgs/kde/frameworks/sonnet/default.nix | 6 +++++- .../frameworks/syntax-highlighting/default.nix | 6 +++++- pkgs/kde/gear/akonadi/default.nix | 2 ++ pkgs/kde/gear/analitza/default.nix | 2 ++ pkgs/kde/gear/angelfish/default.nix | 1 - pkgs/kde/gear/arianna/default.nix | 7 ------- pkgs/kde/gear/audiotube/default.nix | 1 - pkgs/kde/gear/blinken/default.nix | 3 --- pkgs/kde/gear/cantor/default.nix | 2 -- pkgs/kde/gear/elisa/default.nix | 3 --- pkgs/kde/gear/falkon/default.nix | 2 ++ pkgs/kde/gear/ghostwriter/default.nix | 7 +------ pkgs/kde/gear/gwenview/default.nix | 6 +----- pkgs/kde/gear/itinerary/default.nix | 3 --- pkgs/kde/gear/k3b/default.nix | 1 - pkgs/kde/gear/kaccounts-providers/default.nix | 6 +----- pkgs/kde/gear/kalgebra/default.nix | 2 -- pkgs/kde/gear/kalzium/default.nix | 3 --- pkgs/kde/gear/kasts/default.nix | 6 +----- pkgs/kde/gear/kcachegrind/default.nix | 3 +++ pkgs/kde/gear/kclock/default.nix | 2 -- pkgs/kde/gear/kdeconnect-kde/default.nix | 8 +------- pkgs/kde/gear/kdegraphics-mobipocket/default.nix | 1 - pkgs/kde/gear/kdenlive/default.nix | 1 - pkgs/kde/gear/kdepim-runtime/default.nix | 2 -- pkgs/kde/gear/kdev-python/default.nix | 4 +--- pkgs/kde/gear/kdevelop/default.nix | 7 ++++--- pkgs/kde/gear/kgraphviewer/default.nix | 6 +----- pkgs/kde/gear/khelpcenter/default.nix | 16 +++++----------- pkgs/kde/gear/kimagemapeditor/default.nix | 2 -- pkgs/kde/gear/kirigami-gallery/default.nix | 6 +++++- pkgs/kde/gear/klettres/default.nix | 3 --- pkgs/kde/gear/kmime/default.nix | 2 ++ pkgs/kde/gear/kmousetool/default.nix | 3 --- pkgs/kde/gear/kmouth/default.nix | 2 -- pkgs/kde/gear/koko/default.nix | 6 +----- pkgs/kde/gear/konqueror/default.nix | 6 +----- pkgs/kde/gear/konquest/default.nix | 3 --- pkgs/kde/gear/konsole/default.nix | 2 -- pkgs/kde/gear/konversation/default.nix | 6 +++++- pkgs/kde/gear/krecorder/default.nix | 2 -- pkgs/kde/gear/ksirk/default.nix | 1 - pkgs/kde/gear/ktorrent/default.nix | 2 -- pkgs/kde/gear/ktuberling/default.nix | 2 -- pkgs/kde/gear/kunifiedpush/default.nix | 2 -- pkgs/kde/gear/kwave/default.nix | 6 +----- pkgs/kde/gear/kweather/default.nix | 3 --- pkgs/kde/gear/kweathercore/default.nix | 1 - pkgs/kde/gear/kwordquiz/default.nix | 3 --- pkgs/kde/gear/libkdepim/default.nix | 7 ++++++- pkgs/kde/gear/libksieve/default.nix | 2 -- pkgs/kde/gear/marble/default.nix | 5 ----- pkgs/kde/gear/massif-visualizer/default.nix | 6 +----- pkgs/kde/gear/merkuro/default.nix | 2 -- pkgs/kde/gear/messagelib/default.nix | 1 - pkgs/kde/gear/okular/default.nix | 6 +----- pkgs/kde/gear/parley/default.nix | 6 ------ pkgs/kde/gear/skanpage/default.nix | 5 ----- pkgs/kde/gear/step/default.nix | 2 ++ pkgs/kde/gear/tokodon/default.nix | 6 +----- pkgs/kde/misc/kdiagram/default.nix | 6 +++++- pkgs/kde/misc/kirigami-addons/default.nix | 3 ++- pkgs/kde/misc/klevernotes/default.nix | 2 -- pkgs/kde/misc/ktextaddons/default.nix | 4 ---- pkgs/kde/misc/phonon-vlc/default.nix | 2 ++ pkgs/kde/misc/phonon/default.nix | 6 +++++- pkgs/kde/plasma/discover/default.nix | 6 +----- pkgs/kde/plasma/kdeplasma-addons/default.nix | 1 - pkgs/kde/plasma/krdp/default.nix | 8 ++------ pkgs/kde/plasma/kscreen/default.nix | 5 +---- pkgs/kde/plasma/kwin-x11/default.nix | 6 ++++-- pkgs/kde/plasma/kwin/default.nix | 3 --- pkgs/kde/plasma/layer-shell-qt/default.nix | 6 +----- pkgs/kde/plasma/libkscreen/default.nix | 2 ++ pkgs/kde/plasma/plasma-dialer/default.nix | 6 +----- pkgs/kde/plasma/plasma-integration/default.nix | 2 -- pkgs/kde/plasma/plasma-mobile/default.nix | 8 +------- pkgs/kde/plasma/plasma-nm/default.nix | 6 +----- pkgs/kde/plasma/plasma-workspace/default.nix | 5 +---- pkgs/kde/plasma/spectacle/default.nix | 5 ----- .../plasma/xdg-desktop-portal-kde/default.nix | 6 +----- 107 files changed, 181 insertions(+), 269 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 70485f72621d..9c0d01fd5838 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation (finalAttrs: { bison kdePackages.wrapQtAppsHook wrapGAppsHook3 - - kdePackages.qtmultimedia - kdePackages.qtnetworkauth - kdePackages.qtscxml - kdePackages.qtwebengine ]; # Based on , diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index ce9b5e6df4f8..83d91106b6a5 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,7 +1,6 @@ { mkKdeDerivation, python3, - qttools, }: mkKdeDerivation { pname = "extra-cmake-modules"; @@ -12,13 +11,10 @@ mkKdeDerivation { outputs = [ "out" ]; + # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. + # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 propagatedNativeBuildInputs = [ - # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. - # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 python3 - - # Most packages require QDoc to generate docs, even if they're not installed - (qttools.override { withClang = true; }) ]; setupHook = ./ecm-hook.sh; diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix index 53aaa1dfa0b5..d9d15c9592a8 100644 --- a/pkgs/kde/frameworks/karchive/default.nix +++ b/pkgs/kde/frameworks/karchive/default.nix @@ -1,11 +1,15 @@ { mkKdeDerivation, + qttools, pkg-config, xz, }: mkKdeDerivation { pname = "karchive"; - extraNativeBuildInputs = [ pkg-config ]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; extraBuildInputs = [ xz ]; } diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix index 390bf1da4100..4ed23d29fd1c 100644 --- a/pkgs/kde/frameworks/kauth/default.nix +++ b/pkgs/kde/frameworks/kauth/default.nix @@ -1,8 +1,13 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kauth"; # Late resolve paths so things end up in their own prefix # FIXME(later): discuss with upstream patches = [ ./fix-paths.patch ]; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix index 2d93db76edf5..e52786637ff1 100644 --- a/pkgs/kde/frameworks/kbookmarks/default.nix +++ b/pkgs/kde/frameworks/kbookmarks/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kbookmarks"; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix index 66c0ae45cb0e..c2649fe03dec 100644 --- a/pkgs/kde/frameworks/kcodecs/default.nix +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -1,11 +1,13 @@ { mkKdeDerivation, + qttools, gperf, }: mkKdeDerivation { pname = "kcodecs"; extraNativeBuildInputs = [ + qttools gperf ]; } diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix index c21ebcf00a37..922182e9280b 100644 --- a/pkgs/kde/frameworks/kcompletion/default.nix +++ b/pkgs/kde/frameworks/kcompletion/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kcompletion"; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix index 57844a4ef4f0..451ec7db5d28 100644 --- a/pkgs/kde/frameworks/kconfig/default.nix +++ b/pkgs/kde/frameworks/kconfig/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, + qttools, qtdeclarative, }: mkKdeDerivation { pname = "kconfig"; + extraNativeBuildInputs = [ qttools ]; extraPropagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix index 38f05b94d7a8..adeec792b9dd 100644 --- a/pkgs/kde/frameworks/kcoreaddons/default.nix +++ b/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, shared-mime-info, qtdeclarative, }: @@ -9,6 +10,7 @@ mkKdeDerivation { hasPythonBindings = true; extraNativeBuildInputs = [ + qttools shared-mime-info ]; extraBuildInputs = [ qtdeclarative ]; diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix index 86412e584169..c75df4132c0b 100644 --- a/pkgs/kde/frameworks/kdbusaddons/default.nix +++ b/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -1,5 +1,10 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kdbusaddons"; + + extraNativeBuildInputs = [ qttools ]; meta.mainProgram = "kquitapp6"; } diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix index 3f2d6cc5df49..ce22856035e3 100644 --- a/pkgs/kde/frameworks/kdnssd/default.nix +++ b/pkgs/kde/frameworks/kdnssd/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, + qttools, avahi, }: mkKdeDerivation { pname = "kdnssd"; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ avahi ]; } diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix index d0d45184885c..10d40753ae30 100644 --- a/pkgs/kde/frameworks/kglobalaccel/default.nix +++ b/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kglobalaccel"; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix index 21284ae13d94..966ca350c6fd 100644 --- a/pkgs/kde/frameworks/kholidays/default.nix +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, + qttools, qtdeclarative, }: mkKdeDerivation { pname = "kholidays"; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index b93c82f3a393..83edf8c52654 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -2,6 +2,7 @@ stdenv, mkKdeDerivation, qtsvg, + qttools, qtdeclarative, qt5compat, qqc2-desktop-style, @@ -16,11 +17,12 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - extraNativeBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; extraBuildInputs = [ qtdeclarative ]; - extraPropagatedBuildInputs = [ qt5compat ]; - propagatedNativeBuildInputs = [ qt5compat ]; }; in stdenv.mkDerivation { diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix index f1d42fec3715..487d63092c00 100644 --- a/pkgs/kde/frameworks/kitemviews/default.nix +++ b/pkgs/kde/frameworks/kitemviews/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kitemviews"; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix index d4bcc28c550d..4fd488aa5ad8 100644 --- a/pkgs/kde/frameworks/kjobwidgets/default.nix +++ b/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -1,7 +1,12 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kjobwidgets"; + extraNativeBuildInputs = [ qttools ]; + # FIXME: depends on kcoreaddons typesystem info, we need # a Shiboken wrapper to propagate this properly. extraCmakeFlags = [ "-DBUILD_PYTHON_BINDINGS=OFF" ]; diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix index 240f35716a2d..b331da36140f 100644 --- a/pkgs/kde/frameworks/knotifications/default.nix +++ b/pkgs/kde/frameworks/knotifications/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, qtdeclarative, libcanberra, }: @@ -8,6 +9,7 @@ mkKdeDerivation { hasPythonBindings = true; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ qtdeclarative libcanberra diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix index 86cd9263aa20..422446630451 100644 --- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix +++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -1,6 +1,11 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kstatusnotifieritem"; hasPythonBindings = true; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix index 2aec466ec92e..e7c470c99d09 100644 --- a/pkgs/kde/frameworks/ktexteditor/default.nix +++ b/pkgs/kde/frameworks/ktexteditor/default.nix @@ -7,8 +7,6 @@ mkKdeDerivation { pname = "ktexteditor"; - extraNativeBuildInputs = [ qtspeech ]; - extraBuildInputs = [ qtdeclarative qtspeech diff --git a/pkgs/kde/frameworks/ktextwidgets/default.nix b/pkgs/kde/frameworks/ktextwidgets/default.nix index 78d041d38c95..a90de215c598 100644 --- a/pkgs/kde/frameworks/ktextwidgets/default.nix +++ b/pkgs/kde/frameworks/ktextwidgets/default.nix @@ -6,8 +6,6 @@ mkKdeDerivation { pname = "ktextwidgets"; - extraNativeBuildInputs = [ qtspeech ]; - extraBuildInputs = [ qtspeech qttools diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix index c441c1cc8b89..7379061982b5 100644 --- a/pkgs/kde/frameworks/kuserfeedback/default.nix +++ b/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, qtsvg, }: mkKdeDerivation { @@ -10,5 +11,8 @@ mkKdeDerivation { "-DENABLE_CONSOLE=0" "-DENABLE_CLI=0" ]; - extraNativeBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix index 4784d4696ea9..65cc84cf938f 100644 --- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix +++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -1,6 +1,11 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "kwidgetsaddons"; hasPythonBindings = true; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index fb4349a53654..5ae167b1cc9a 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, qtdeclarative, qtwayland, pkg-config, @@ -8,6 +9,7 @@ mkKdeDerivation { pname = "kwindowsystem"; extraNativeBuildInputs = [ + qttools pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix index 5723075389ca..4cde20f930b0 100644 --- a/pkgs/kde/frameworks/prison/default.nix +++ b/pkgs/kde/frameworks/prison/default.nix @@ -8,11 +8,9 @@ mkKdeDerivation { pname = "prison"; - propagatedNativeBuildInputs = [ qtmultimedia ]; - extraPropagatedBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtdeclarative + qtmultimedia qrencode libdmtx ]; diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index 469f4b23f1b9..45f22d8fa5d3 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -1,11 +1,13 @@ { mkKdeDerivation, qtdeclarative, + qttools, kirigami, }: mkKdeDerivation { pname = "qqc2-desktop-style"; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ qtdeclarative kirigami.unwrapped diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index 51c4be689aeb..6b767e9d43f7 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, bison, flex, libimobiledevice, @@ -13,6 +14,7 @@ mkKdeDerivation { ]; extraNativeBuildInputs = [ + qttools bison flex ]; diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix index 329f532a710c..fbeb8b10d555 100644 --- a/pkgs/kde/frameworks/sonnet/default.nix +++ b/pkgs/kde/frameworks/sonnet/default.nix @@ -1,6 +1,7 @@ { mkKdeDerivation, qtdeclarative, + qttools, pkg-config, aspell, hunspell, @@ -8,7 +9,10 @@ mkKdeDerivation { pname = "sonnet"; - extraNativeBuildInputs = [ pkg-config ]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; extraBuildInputs = [ qtdeclarative aspell diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix index 0b92eb7eccdc..7985dcb95702 100644 --- a/pkgs/kde/frameworks/syntax-highlighting/default.nix +++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -1,12 +1,16 @@ { mkKdeDerivation, qtdeclarative, + qttools, perl, }: mkKdeDerivation { pname = "syntax-highlighting"; extraBuildInputs = [ qtdeclarative ]; - extraNativeBuildInputs = [ perl ]; + extraNativeBuildInputs = [ + qttools + perl + ]; meta.mainProgram = "ksyntaxhighlighter6"; } diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 843055db79d3..6225b7e9cfda 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -1,6 +1,7 @@ { lib, mkKdeDerivation, + qttools, accounts-qt, kaccounts-integration, shared-mime-info, @@ -35,6 +36,7 @@ mkKdeDerivation { ]; extraNativeBuildInputs = [ + qttools shared-mime-info ]; diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix index 971c2f78f74d..4402ab1d5300 100644 --- a/pkgs/kde/gear/analitza/default.nix +++ b/pkgs/kde/gear/analitza/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, qt5compat, qtsvg, + qttools, qtdeclarative, eigen, }: @@ -11,6 +12,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ qt5compat qtsvg + qttools ]; extraBuildInputs = [ qtdeclarative diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index d18ca798d832..49c578b1c3d3 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -23,7 +23,6 @@ mkKdeDerivation rec { rustPlatform.cargoSetupHook cargo rustc - qtwebengine ]; extraBuildInputs = [ diff --git a/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix index a974f6429fa2..247da11b6d3d 100644 --- a/pkgs/kde/gear/arianna/default.nix +++ b/pkgs/kde/gear/arianna/default.nix @@ -9,12 +9,6 @@ mkKdeDerivation { pname = "arianna"; - extraNativeBuildInputs = [ - qthttpserver - qtwebchannel - qtwebengine - ]; - extraBuildInputs = [ qthttpserver qtsvg @@ -22,6 +16,5 @@ mkKdeDerivation { qtwebengine kitemmodels ]; - meta.mainProgram = "arianna"; } diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix index ae79dc7ae25a..b27ab60155a5 100644 --- a/pkgs/kde/gear/audiotube/default.nix +++ b/pkgs/kde/gear/audiotube/default.nix @@ -27,7 +27,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ ps.pybind11 - qtmultimedia ]; extraBuildInputs = [ diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index bcde9b5a8a82..885384e3f71b 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "blinken"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtmultimedia qtsvg ]; - meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix index 159ae9946c9b..6269359ae178 100644 --- a/pkgs/kde/gear/cantor/default.nix +++ b/pkgs/kde/gear/cantor/default.nix @@ -19,9 +19,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config shared-mime-info - qtwebengine ]; - extraBuildInputs = [ qtsvg qttools diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix index 9162502e8460..ee280ae93198 100644 --- a/pkgs/kde/gear/elisa/default.nix +++ b/pkgs/kde/gear/elisa/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "elisa"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtmultimedia libvlc ]; - meta.mainProgram = "elisa"; } diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix index d5d3ffa3797d..a4fad195a7b0 100644 --- a/pkgs/kde/gear/falkon/default.nix +++ b/pkgs/kde/gear/falkon/default.nix @@ -3,12 +3,14 @@ extra-cmake-modules, qtwebchannel, qtwebengine, + qttools, python3Packages, }: mkKdeDerivation { pname = "falkon"; extraNativeBuildInputs = [ + qttools qtwebchannel qtwebengine ]; diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix index 8493e180266c..1bcb0e004050 100644 --- a/pkgs/kde/gear/ghostwriter/default.nix +++ b/pkgs/kde/gear/ghostwriter/default.nix @@ -16,12 +16,7 @@ mkKdeDerivation { pname = "ghostwriter"; - extraNativeBuildInputs = [ - pkg-config - qtwebchannel - qtwebengine - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qttools diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index f237c341ea45..68a93a36738b 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/pkgs/kde/gear/gwenview/default.nix @@ -15,11 +15,7 @@ mkKdeDerivation { pname = "gwenview"; - extraNativeBuildInputs = [ - pkg-config - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtwayland diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix index 07b338520eb2..0b2292a2ada3 100644 --- a/pkgs/kde/gear/itinerary/default.nix +++ b/pkgs/kde/gear/itinerary/default.nix @@ -15,14 +15,11 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config shared-mime-info - qtpositioning ]; - extraBuildInputs = [ qtlocation qtpositioning libical ]; - meta.mainProgram = "itinerary"; } diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix index 0d30264167cb..06b4630863f1 100644 --- a/pkgs/kde/gear/k3b/default.nix +++ b/pkgs/kde/gear/k3b/default.nix @@ -27,7 +27,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config shared-mime-info - qtwebengine ]; # FIXME: Musicbrainz 2.x???, musepack diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix index ac11b02a3bc5..bf0ecf678302 100644 --- a/pkgs/kde/gear/kaccounts-providers/default.nix +++ b/pkgs/kde/gear/kaccounts-providers/default.nix @@ -7,11 +7,7 @@ mkKdeDerivation { pname = "kaccounts-providers"; - extraNativeBuildInputs = [ - intltool - qtwebengine - ]; - + extraNativeBuildInputs = [ intltool ]; extraBuildInputs = [ qtdeclarative qtwebengine diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix index db6b5ba77b8e..1b3cd47fc93e 100644 --- a/pkgs/kde/gear/kalgebra/default.nix +++ b/pkgs/kde/gear/kalgebra/default.nix @@ -8,8 +8,6 @@ mkKdeDerivation { pname = "kalgebra"; - extraNativeBuildInputs = [ qtwebengine ]; - extraBuildInputs = [ qtsvg qtwebengine diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix index f8e5672a7bcd..7cdcd1efec63 100644 --- a/pkgs/kde/gear/kalzium/default.nix +++ b/pkgs/kde/gear/kalzium/default.nix @@ -14,15 +14,12 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ocaml - qtscxml ]; - extraBuildInputs = [ eigen openbabel qtsvg qtscxml ]; - meta.mainProgram = "kalzium"; } diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 9d56452c3d7a..f95ea1c80892 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/pkgs/kde/gear/kasts/default.nix @@ -9,11 +9,7 @@ mkKdeDerivation { pname = "kasts"; - extraNativeBuildInputs = [ - pkg-config - qtmultimedia - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtmultimedia diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix index c161a0ec5b9c..d657c059ca22 100644 --- a/pkgs/kde/gear/kcachegrind/default.nix +++ b/pkgs/kde/gear/kcachegrind/default.nix @@ -1,11 +1,14 @@ { lib, mkKdeDerivation, + qttools, graphviz, }: mkKdeDerivation { pname = "kcachegrind"; + extraNativeBuildInputs = [ qttools ]; + qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ graphviz ]}" ]; diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix index 0ea54cf45b88..56ec55e885da 100644 --- a/pkgs/kde/gear/kclock/default.nix +++ b/pkgs/kde/gear/kclock/default.nix @@ -6,8 +6,6 @@ mkKdeDerivation { pname = "kclock"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtsvg qtmultimedia diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index eaba370102c7..d81c487e452f 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -26,13 +26,7 @@ mkKdeDerivation { echo "${sshfs}" > $out/nix-support/depends ''; - extraNativeBuildInputs = [ - pkg-config - qtconnectivity - qtmultimedia - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtconnectivity qtmultimedia diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix index 84cf2576d704..56596b0537f6 100644 --- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix +++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -5,6 +5,5 @@ mkKdeDerivation { pname = "kdegraphics-mobipocket"; - extraNativeBuildInputs = [ qt5compat ]; extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index a7b9aa7f6764..eaddc66b65f2 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -32,7 +32,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config shared-mime-info - qtnetworkauth ]; extraBuildInputs = [ diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix index 42cd2a751a51..e3cd581afcd5 100644 --- a/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -18,9 +18,7 @@ mkKdeDerivation { pkg-config shared-mime-info libxslt - qtnetworkauth ]; - # FIXME: libkolabxml extraBuildInputs = [ qtnetworkauth diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix index b175af1d7194..23901bb4d78e 100644 --- a/pkgs/kde/gear/kdev-python/default.nix +++ b/pkgs/kde/gear/kdev-python/default.nix @@ -1,6 +1,4 @@ -{ - mkKdeDerivation, -}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdev-python"; } diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix index e4def55487c7..5a2b02b41530 100644 --- a/pkgs/kde/gear/kdevelop/default.nix +++ b/pkgs/kde/gear/kdevelop/default.nix @@ -23,6 +23,10 @@ mkKdeDerivation { shared-mime-info ]; + extraPropagatedBuildInputs = [ + qtwebengine + ]; + extraBuildInputs = [ qttools apr @@ -34,9 +38,6 @@ mkKdeDerivation { subversion ]; - propagatedNativeBuildInputs = [ qtwebengine ]; - extraPropagatedBuildInputs = [ qtwebengine ]; - extraCmakeFlags = [ "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include" "-DAPR_CONFIG_PATH=${apr.dev}/bin" diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix index 96cf05526b15..560d4685921a 100644 --- a/pkgs/kde/gear/kgraphviewer/default.nix +++ b/pkgs/kde/gear/kgraphviewer/default.nix @@ -9,11 +9,7 @@ mkKdeDerivation { pname = "kgraphviewer"; - extraNativeBuildInputs = [ - pkg-config - qt5compat - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qt5compat qtsvg diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix index 1e849647e803..795ec3b4aeb3 100644 --- a/pkgs/kde/gear/khelpcenter/default.nix +++ b/pkgs/kde/gear/khelpcenter/default.nix @@ -10,22 +10,16 @@ mkKdeDerivation { pname = "khelpcenter"; - patches = [ - (replaceVars ./use_nix_paths_for_mansearch_utilities.patch { - inherit man-db; - }) - ]; - - extraNativeBuildInputs = [ - qtwebengine - ]; - extraBuildInputs = [ qtwebengine xapian python3 kio-extras ]; - + patches = [ + (replaceVars ./use_nix_paths_for_mansearch_utilities.patch { + inherit man-db; + }) + ]; meta.mainProgram = "khelpcenter"; } diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix index af57c792bdc2..9341cf5ab4db 100644 --- a/pkgs/kde/gear/kimagemapeditor/default.nix +++ b/pkgs/kde/gear/kimagemapeditor/default.nix @@ -5,8 +5,6 @@ mkKdeDerivation { pname = "kimagemapeditor"; - extraNativeBuildInputs = [ qtwebengine ]; extraBuildInputs = [ qtwebengine ]; - meta.mainProgram = "kimagemapeditor"; } diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix index f99fd3e1fca6..bb739046baca 100644 --- a/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -1,9 +1,13 @@ { mkKdeDerivation, qtsvg, + qttools, }: mkKdeDerivation { pname = "kirigami-gallery"; - extraNativeBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index c8aed6950e08..70dd2dbcec72 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "klettres"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtmultimedia qtsvg ]; - meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix index 4f1fcbea3500..300185643481 100644 --- a/pkgs/kde/gear/kmime/default.nix +++ b/pkgs/kde/gear/kmime/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, + qttools, ki18n, }: mkKdeDerivation { pname = "kmime"; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ ki18n ]; } diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index c07a0c4ebd0c..7eca9ab12c73 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "kmousetool"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtmultimedia xorg.libXt ]; - meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix index 60235bea24f3..098f8a5ec33f 100644 --- a/pkgs/kde/gear/kmouth/default.nix +++ b/pkgs/kde/gear/kmouth/default.nix @@ -5,8 +5,6 @@ mkKdeDerivation { pname = "kmouth"; - extraNativeBuildInputs = [ qtspeech ]; extraBuildInputs = [ qtspeech ]; - meta.mainProgram = "kmouth"; } diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index a2a5b443c49d..613f2981fe52 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -37,11 +37,7 @@ mkKdeDerivation { ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [ - pkg-config - qtpositioning - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtmultimedia qtpositioning diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix index 61bcd13ec059..5bd29359e979 100644 --- a/pkgs/kde/gear/konqueror/default.nix +++ b/pkgs/kde/gear/konqueror/default.nix @@ -6,11 +6,7 @@ mkKdeDerivation { pname = "konqueror"; - extraNativeBuildInputs = [ - hunspell - qtwebengine - ]; - + extraNativeBuildInputs = [ hunspell ]; extraBuildInputs = [ qtwebengine ]; extraCmakeFlags = [ diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix index 61569d7aeaf1..3b7cfbf59e54 100644 --- a/pkgs/kde/gear/konquest/default.nix +++ b/pkgs/kde/gear/konquest/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "konquest"; - extraNativeBuildInputs = [ qtscxml ]; - extraBuildInputs = [ qtscxml qtsvg ]; - meta.mainProgram = "konquest"; } diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix index a1c225e723b5..0e95e6a045a8 100644 --- a/pkgs/kde/gear/konsole/default.nix +++ b/pkgs/kde/gear/konsole/default.nix @@ -6,8 +6,6 @@ mkKdeDerivation { pname = "konsole"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qt5compat qtmultimedia diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix index e2e59d5d2303..b78bb62f62fc 100644 --- a/pkgs/kde/gear/konversation/default.nix +++ b/pkgs/kde/gear/konversation/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, qtmultimedia, qt5compat, }: @@ -7,7 +8,10 @@ mkKdeDerivation { pname = "konversation"; extraBuildInputs = [ qt5compat ]; - extraNativeBuildInputs = [ qtmultimedia ]; + extraNativeBuildInputs = [ + qtmultimedia + qttools + ]; meta.mainProgram = "konversation"; } diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix index 5b6a973c9c3e..04d9d4c05826 100644 --- a/pkgs/kde/gear/krecorder/default.nix +++ b/pkgs/kde/gear/krecorder/default.nix @@ -5,8 +5,6 @@ mkKdeDerivation { pname = "krecorder"; - extraNativeBuildInputs = [ qtmultimedia ]; extraBuildInputs = [ qtmultimedia ]; - meta.mainProgram = "krecorder"; } diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix index 3e96b6eb60d6..2123d3d54abf 100644 --- a/pkgs/kde/gear/ksirk/default.nix +++ b/pkgs/kde/gear/ksirk/default.nix @@ -5,6 +5,5 @@ mkKdeDerivation { pname = "ksirk"; - extraNativeBuildInputs = [ qtmultimedia ]; extraBuildInputs = [ qtmultimedia ]; } diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix index 359e80872fbe..ae1d8aedfdf3 100644 --- a/pkgs/kde/gear/ktorrent/default.nix +++ b/pkgs/kde/gear/ktorrent/default.nix @@ -7,8 +7,6 @@ mkKdeDerivation { pname = "ktorrent"; - extraNativeBuildInputs = [ qtwebengine ]; - extraBuildInputs = [ qtwebengine taglib diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix index 4d953b535760..278f7f823d3d 100644 --- a/pkgs/kde/gear/ktuberling/default.nix +++ b/pkgs/kde/gear/ktuberling/default.nix @@ -5,8 +5,6 @@ mkKdeDerivation { pname = "ktuberling"; - extraNativeBuildInputs = [ qtmultimedia ]; extraBuildInputs = [ qtmultimedia ]; - meta.mainProgram = "ktuberling"; } diff --git a/pkgs/kde/gear/kunifiedpush/default.nix b/pkgs/kde/gear/kunifiedpush/default.nix index 97822e31e225..ccecbca0f2a3 100644 --- a/pkgs/kde/gear/kunifiedpush/default.nix +++ b/pkgs/kde/gear/kunifiedpush/default.nix @@ -7,8 +7,6 @@ mkKdeDerivation { pname = "kunifiedpush"; - extraNativeBuildInputs = [ qtwebsockets ]; - extraBuildInputs = [ qtwebsockets kdeclarative diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix index bb2fcea752bd..e7fbff9937ca 100644 --- a/pkgs/kde/gear/kwave/default.nix +++ b/pkgs/kde/gear/kwave/default.nix @@ -19,11 +19,7 @@ mkKdeDerivation { pname = "kwave"; - extraNativeBuildInputs = [ - pkg-config - qtmultimedia - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtmultimedia diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix index a77d37b9c9ba..20d4c8a1e670 100644 --- a/pkgs/kde/gear/kweather/default.nix +++ b/pkgs/kde/gear/kweather/default.nix @@ -7,13 +7,10 @@ mkKdeDerivation { pname = "kweather"; - extraNativeBuildInputs = [ qtcharts ]; - extraBuildInputs = [ qtsvg qtcharts kholidays ]; - meta.mainProgram = "kweather"; } diff --git a/pkgs/kde/gear/kweathercore/default.nix b/pkgs/kde/gear/kweathercore/default.nix index 852e97237490..ca45515dfdb8 100644 --- a/pkgs/kde/gear/kweathercore/default.nix +++ b/pkgs/kde/gear/kweathercore/default.nix @@ -5,6 +5,5 @@ mkKdeDerivation { pname = "kweathercore"; - extraNativeBuildInputs = [ qtpositioning ]; extraBuildInputs = [ qtpositioning ]; } diff --git a/pkgs/kde/gear/kwordquiz/default.nix b/pkgs/kde/gear/kwordquiz/default.nix index d2a11b4c8d96..ad57c8e2d71b 100644 --- a/pkgs/kde/gear/kwordquiz/default.nix +++ b/pkgs/kde/gear/kwordquiz/default.nix @@ -6,12 +6,9 @@ mkKdeDerivation { pname = "kwordquiz"; - extraNativeBuildInputs = [ qtmultimedia ]; - extraBuildInputs = [ qtsvg qtmultimedia ]; - meta.mainProgram = "kwordquiz"; } diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix index 6c39a9db3ef5..fc9d3f3d637c 100644 --- a/pkgs/kde/gear/libkdepim/default.nix +++ b/pkgs/kde/gear/libkdepim/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qttools, +}: mkKdeDerivation { pname = "libkdepim"; + + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix index 187ef29419e6..e36d8995687e 100644 --- a/pkgs/kde/gear/libksieve/default.nix +++ b/pkgs/kde/gear/libksieve/default.nix @@ -6,8 +6,6 @@ mkKdeDerivation { pname = "libksieve"; - extraNativeBuildInputs = [ qtwebengine ]; - extraBuildInputs = [ qtwebengine cyrus_sasl diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix index 3cf83babad2a..9c3723815d51 100644 --- a/pkgs/kde/gear/marble/default.nix +++ b/pkgs/kde/gear/marble/default.nix @@ -6,7 +6,6 @@ shared-mime-info, qtpositioning, - qtserialport, qtsvg, qttools, qtwebengine, @@ -26,14 +25,10 @@ mkKdeDerivation { perl pkg-config shared-mime-info - qtpositioning - qtserialport - qtwebengine ]; extraBuildInputs = [ qtpositioning - qtserialport qtsvg qttools qtwebengine diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix index 18253915a8ab..04b958217e74 100644 --- a/pkgs/kde/gear/massif-visualizer/default.nix +++ b/pkgs/kde/gear/massif-visualizer/default.nix @@ -7,13 +7,9 @@ mkKdeDerivation { pname = "massif-visualizer"; - extraNativeBuildInputs = [ - shared-mime-info - qt5compat - ]; - extraBuildInputs = [ qt5compat qtsvg ]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix index c45635087f88..a6a2c70c5732 100644 --- a/pkgs/kde/gear/merkuro/default.nix +++ b/pkgs/kde/gear/merkuro/default.nix @@ -7,8 +7,6 @@ mkKdeDerivation { pname = "merkuro"; - extraNativeBuildInputs = [ qtlocation ]; - extraBuildInputs = [ qtlocation qtsvg diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix index e68c343ff1b7..db8f4e04f045 100644 --- a/pkgs/kde/gear/messagelib/default.nix +++ b/pkgs/kde/gear/messagelib/default.nix @@ -5,6 +5,5 @@ mkKdeDerivation { pname = "messagelib"; - propagatedNativeBuildInputs = [ qtwebengine ]; extraPropagatedBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index d64404b4ed8f..b6048d9611d4 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -14,11 +14,7 @@ mkKdeDerivation { pname = "okular"; - extraNativeBuildInputs = [ - pkg-config - qtspeech - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtspeech qtsvg diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix index 437f85c97cc3..e2a275c4c02c 100644 --- a/pkgs/kde/gear/parley/default.nix +++ b/pkgs/kde/gear/parley/default.nix @@ -7,16 +7,10 @@ mkKdeDerivation { pname = "parley"; - extraNativeBuildInputs = [ - qtmultimedia - qtwebengine - ]; - extraBuildInputs = [ qtsvg qtmultimedia qtwebengine ]; - meta.mainProgram = "parley"; } diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix index 69b622bc264b..4c9e10422098 100644 --- a/pkgs/kde/gear/skanpage/default.nix +++ b/pkgs/kde/gear/skanpage/default.nix @@ -8,15 +8,10 @@ mkKdeDerivation { pname = "skanpage"; - extraNativeBuildInputs = [ - qtwebengine - ]; - extraBuildInputs = [ qtwebengine (tesseract5.override { enableLanguages = tesseractLanguages; }) leptonica ]; - meta.mainProgram = "skanpage"; } diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix index 4c5283bde774..983755d21139 100644 --- a/pkgs/kde/gear/step/default.nix +++ b/pkgs/kde/gear/step/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qttools, qtsvg, pkg-config, eigen, @@ -11,6 +12,7 @@ mkKdeDerivation { pname = "step"; extraNativeBuildInputs = [ + qttools qtsvg pkg-config shared-mime-info diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index c38d4eec3aad..467ebc2837e6 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -10,11 +10,7 @@ mkKdeDerivation { pname = "tokodon"; - extraNativeBuildInputs = [ - pkg-config - qtwebsockets - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtmultimedia qtsvg diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index ac99319ca255..48355004b761 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -2,6 +2,7 @@ lib, mkKdeDerivation, fetchurl, + qttools, qtsvg, }: mkKdeDerivation rec { @@ -13,7 +14,10 @@ mkKdeDerivation rec { hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; }; - extraNativeBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; meta.license = [ lib.licenses.gpl2Only ]; } diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index ec7cd7b09ea8..98ccc2931470 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -4,6 +4,7 @@ fetchurl, qtdeclarative, qt5compat, + qttools, }: mkKdeDerivation rec { pname = "kirigami-addons"; @@ -14,9 +15,9 @@ mkKdeDerivation rec { hash = "sha256-AAKK5N+Z4lBRg0XqKNnN9J1wDprKxIJzS7UThNoR+UU="; }; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ qtdeclarative ]; extraPropagatedBuildInputs = [ qt5compat ]; - propagatedNativeBuildInputs = [ qt5compat ]; meta.license = with lib.licenses; [ bsd2 diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 7a5f32c99868..2a7c14b9cefd 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -16,8 +16,6 @@ mkKdeDerivation rec { hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I="; }; - extraNativeBuildInputs = [ qtwebengine ]; - extraBuildInputs = [ qtsvg qtwebengine diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix index 1a2676043358..7296d8b22fe7 100644 --- a/pkgs/kde/misc/ktextaddons/default.nix +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -16,10 +16,6 @@ mkKdeDerivation rec { hash = "sha256-2YRlBaUvl72mTq0ZMDK8KVc+wxSB9HO+PFhvW4Mh7Nw="; }; - extraNativeBuildInputs = [ - qtspeech - ]; - extraBuildInputs = [ qtspeech qttools diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix index 8823be7d9376..88f278d92986 100644 --- a/pkgs/kde/misc/phonon-vlc/default.nix +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -2,6 +2,7 @@ lib, mkKdeDerivation, fetchurl, + qttools, libvlc, }: mkKdeDerivation rec { @@ -13,6 +14,7 @@ mkKdeDerivation rec { hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; }; + extraNativeBuildInputs = [ qttools ]; extraBuildInputs = [ libvlc ]; cmakeFlags = [ diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix index a9644f4c29d8..76e57f30b3a5 100644 --- a/pkgs/kde/misc/phonon/default.nix +++ b/pkgs/kde/misc/phonon/default.nix @@ -7,6 +7,7 @@ pkg-config, libpulseaudio, qt5compat, + qttools, }: mkKdeDerivation rec { pname = "phonon"; @@ -24,7 +25,10 @@ mkKdeDerivation rec { qt5compat ]; - extraNativeBuildInputs = [ pkg-config ]; + extraNativeBuildInputs = [ + pkg-config + qttools + ]; cmakeFlags = [ "-DPHONON_BUILD_QT5=0" diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index d95dbe4e2532..6bac06517954 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/pkgs/kde/plasma/discover/default.nix @@ -15,11 +15,7 @@ mkKdeDerivation { ./qml-deps.patch ]; - extraNativeBuildInputs = [ - pkg-config - qtwebview - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebview discount diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index 6b23d5c1a326..e23fdacdf158 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -5,6 +5,5 @@ mkKdeDerivation { pname = "kdeplasma-addons"; - extraNativeBuildInputs = [ qtwebengine ]; extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 2c1860db1d88..7f1d1bd89a69 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -16,13 +16,9 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [ - pkg-config - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ - freerdp qtwayland + freerdp ]; } diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 35c7c5d722e9..2f91e980bbfa 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -9,10 +9,7 @@ mkKdeDerivation { pname = "kscreen"; - extraNativeBuildInputs = [ - pkg-config - qtsensors - ]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsensors diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix index 917ef8ea0d54..9573bbecb954 100644 --- a/pkgs/kde/plasma/kwin-x11/default.nix +++ b/pkgs/kde/plasma/kwin-x11/default.nix @@ -1,7 +1,9 @@ { mkKdeDerivation, pkg-config, + qt5compat, qtsensors, + qttools, qtwayland, xorg, libcanberra, @@ -24,12 +26,12 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config python3 - qtsensors - qtwayland ]; extraBuildInputs = [ + qt5compat qtsensors + qttools qtwayland libgbm diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index b923c448e72f..a7aef2545865 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -40,10 +40,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config python3 - qtsensors - qtwayland ]; - extraBuildInputs = [ qtquick3d qtsensors diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index 0a5a12bac047..009b2633b6f7 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -6,10 +6,6 @@ mkKdeDerivation { pname = "layer-shell-qt"; - extraNativeBuildInputs = [ - pkg-config - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix index dd00b0738975..fa969f46a537 100644 --- a/pkgs/kde/plasma/libkscreen/default.nix +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -1,6 +1,7 @@ { mkKdeDerivation, qtwayland, + qttools, jq, wayland, }: @@ -8,6 +9,7 @@ mkKdeDerivation { pname = "libkscreen"; extraNativeBuildInputs = [ + qttools qtwayland jq wayland diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix index 766b83c2590d..ca5a7cc22182 100644 --- a/pkgs/kde/plasma/plasma-dialer/default.nix +++ b/pkgs/kde/plasma/plasma-dialer/default.nix @@ -9,11 +9,7 @@ mkKdeDerivation { pname = "plasma-dialer"; - extraNativeBuildInputs = [ - pkg-config - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland callaudiod diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index e3831018b00f..55c1bb7ee10a 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -61,8 +61,6 @@ mkKdeDerivation { "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; - extraNativeBuildInputs = [ qtwayland ]; - extraBuildInputs = [ qtwayland xorg.libXcursor diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix index 870da8b6e8b4..18de7ba8e59a 100644 --- a/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -8,17 +8,11 @@ mkKdeDerivation { pname = "plasma-mobile"; - extraNativeBuildInputs = [ - pkg-config - qtsensors - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsensors qtwayland ]; - postFixup = '' substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ --replace-fail \ diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index de21dbed07b3..3662452bad7b 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -16,11 +16,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [ - pkg-config - qtwebengine - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebengine mobile-broadband-provider-info diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index cd5aa2615644..90b76badce64 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -43,12 +43,9 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config spirv-tools - qtlocation - qtpositioning - qtwayland ]; - extraBuildInputs = [ + qtlocation qtpositioning qtsvg qtwayland diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix index 4c76b11eb58b..c5c71a1beaa2 100644 --- a/pkgs/kde/plasma/spectacle/default.nix +++ b/pkgs/kde/plasma/spectacle/default.nix @@ -7,11 +7,6 @@ mkKdeDerivation { pname = "spectacle"; - extraNativeBuildInputs = [ - qtwayland - qtmultimedia - ]; - extraBuildInputs = [ qtwayland qtmultimedia diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index cf6aaad08e53..0614c0c191d5 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -7,11 +7,7 @@ mkKdeDerivation { pname = "xdg-desktop-portal-kde"; - extraNativeBuildInputs = [ - pkg-config - qtwayland - ]; - + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland cups