Revert "kdePackages.extra-cmake-modules: propagate qdoc by default"

This reverts commit 618789b27f061672d1a3b4897d41b2d44869575a.

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 <https://www.digikam.org/api/index.html#externaldeps>,

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;

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 ];
 }

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 ];
 }

pkgs/kde/frameworks/kbookmarks/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kbookmarks";
+
+  extraNativeBuildInputs = [ qttools ];
 }

pkgs/kde/frameworks/kcodecs/default.nix

@@ -1,11 +1,13 @@
 {
   mkKdeDerivation,
+  qttools,
   gperf,
 }:
 mkKdeDerivation {
   pname = "kcodecs";
 
   extraNativeBuildInputs = [
+    qttools
     gperf
   ];
 }

pkgs/kde/frameworks/kcompletion/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kcompletion";
+
+  extraNativeBuildInputs = [ qttools ];
 }

pkgs/kde/frameworks/kconfig/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kconfig";
 
+  extraNativeBuildInputs = [ qttools ];
   extraPropagatedBuildInputs = [ qtdeclarative ];
 }

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 ];

pkgs/kde/frameworks/kdbusaddons/default.nix

@@ -1,5 +1,10 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kdbusaddons";
+
+  extraNativeBuildInputs = [ qttools ];
   meta.mainProgram = "kquitapp6";
 }

pkgs/kde/frameworks/kdnssd/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   avahi,
 }:
 mkKdeDerivation {
   pname = "kdnssd";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ avahi ];
 }

pkgs/kde/frameworks/kglobalaccel/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kglobalaccel";
+
+  extraNativeBuildInputs = [ qttools ];
 }

pkgs/kde/frameworks/kholidays/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kholidays";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ qtdeclarative ];
 }

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 {

pkgs/kde/frameworks/kitemviews/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kitemviews";
+
+  extraNativeBuildInputs = [ qttools ];
 }

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" ];

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

pkgs/kde/frameworks/kstatusnotifieritem/default.nix

@@ -1,6 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kstatusnotifieritem";
 
   hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }

pkgs/kde/frameworks/ktexteditor/default.nix

@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "ktexteditor";
 
-  extraNativeBuildInputs = [ qtspeech ];
-
   extraBuildInputs = [
     qtdeclarative
     qtspeech

pkgs/kde/frameworks/ktextwidgets/default.nix

@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "ktextwidgets";
 
-  extraNativeBuildInputs = [ qtspeech ];
-
   extraBuildInputs = [
     qtspeech
     qttools

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
+  ];
 }

pkgs/kde/frameworks/kwidgetsaddons/default.nix

@@ -1,6 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kwidgetsaddons";
 
   hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }

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 = [

pkgs/kde/frameworks/prison/default.nix

@@ -8,11 +8,9 @@
 mkKdeDerivation {
   pname = "prison";
 
-  propagatedNativeBuildInputs = [ qtmultimedia ];
-  extraPropagatedBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtdeclarative
+    qtmultimedia
     qrencode
     libdmtx
   ];

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

pkgs/kde/frameworks/solid/default.nix

@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   bison,
   flex,
   libimobiledevice,
@@ -13,6 +14,7 @@ mkKdeDerivation {
   ];
 
   extraNativeBuildInputs = [
+    qttools
     bison
     flex
   ];

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

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";
 }

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
   ];
 

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

pkgs/kde/gear/angelfish/default.nix

@@ -23,7 +23,6 @@ mkKdeDerivation rec {
     rustPlatform.cargoSetupHook
     cargo
     rustc
-    qtwebengine
   ];
 
   extraBuildInputs = [

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";
 }

pkgs/kde/gear/audiotube/default.nix

@@ -27,7 +27,6 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [
     ps.pybind11
-    qtmultimedia
   ];
 
   extraBuildInputs = [

pkgs/kde/gear/blinken/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "blinken";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
-
   meta.mainProgram = "blinken";
 }

pkgs/kde/gear/cantor/default.nix

@@ -19,9 +19,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtwebengine
   ];
-
   extraBuildInputs = [
     qtsvg
     qttools

pkgs/kde/gear/elisa/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "elisa";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     libvlc
   ];
-
   meta.mainProgram = "elisa";
 }

pkgs/kde/gear/falkon/default.nix

@@ -3,12 +3,14 @@
   extra-cmake-modules,
   qtwebchannel,
   qtwebengine,
+  qttools,
   python3Packages,
 }:
 mkKdeDerivation {
   pname = "falkon";
 
   extraNativeBuildInputs = [
+    qttools
     qtwebchannel
     qtwebengine
   ];

pkgs/kde/gear/ghostwriter/default.nix

@@ -16,12 +16,7 @@
 mkKdeDerivation {
   pname = "ghostwriter";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwebchannel
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtsvg
     qttools

pkgs/kde/gear/gwenview/default.nix

@@ -15,11 +15,7 @@
 mkKdeDerivation {
   pname = "gwenview";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwayland
-  ];
-
   extraBuildInputs = [
     qtsvg
     qtwayland

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";
 }

pkgs/kde/gear/k3b/default.nix

@@ -27,7 +27,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtwebengine
   ];
 
   # FIXME: Musicbrainz 2.x???, musepack

pkgs/kde/gear/kaccounts-providers/default.nix

@@ -7,11 +7,7 @@
 mkKdeDerivation {
   pname = "kaccounts-providers";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ intltool ];
-    intltool
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtdeclarative
     qtwebengine

pkgs/kde/gear/kalgebra/default.nix

@@ -8,8 +8,6 @@
 mkKdeDerivation {
   pname = "kalgebra";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtsvg
     qtwebengine

pkgs/kde/gear/kalzium/default.nix

@@ -14,15 +14,12 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     ocaml
-    qtscxml
   ];
-
   extraBuildInputs = [
     eigen
     openbabel
     qtsvg
     qtscxml
   ];
-
   meta.mainProgram = "kalzium";
 }

pkgs/kde/gear/kasts/default.nix

@@ -9,11 +9,7 @@
 mkKdeDerivation {
   pname = "kasts";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtmultimedia
-  ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia

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 ]}"
   ];

pkgs/kde/gear/kclock/default.nix

@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "kclock";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia

pkgs/kde/gear/kdeconnect-kde/default.nix

@@ -26,13 +26,7 @@ mkKdeDerivation {
     echo "${sshfs}" > $out/nix-support/depends
   '';
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtconnectivity
-    qtmultimedia
-    qtwayland
-  ];
-
   extraBuildInputs = [
     qtconnectivity
     qtmultimedia

pkgs/kde/gear/kdegraphics-mobipocket/default.nix

@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kdegraphics-mobipocket";
 
-  extraNativeBuildInputs = [ qt5compat ];
   extraBuildInputs = [ qt5compat ];
 }

pkgs/kde/gear/kdenlive/default.nix

@@ -32,7 +32,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtnetworkauth
   ];
 
   extraBuildInputs = [

pkgs/kde/gear/kdepim-runtime/default.nix

@@ -18,9 +18,7 @@ mkKdeDerivation {
     pkg-config
     shared-mime-info
     libxslt
-    qtnetworkauth
   ];
-
   # FIXME: libkolabxml
   extraBuildInputs = [
     qtnetworkauth

pkgs/kde/gear/kdev-python/default.nix

@@ -1,6 +1,4 @@
-{
+{ mkKdeDerivation }:
-  mkKdeDerivation,
-}:
 mkKdeDerivation {
   pname = "kdev-python";
 }

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"

pkgs/kde/gear/kgraphviewer/default.nix

@@ -9,11 +9,7 @@
 mkKdeDerivation {
   pname = "kgraphviewer";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qt5compat
-  ];
-
   extraBuildInputs = [
     qt5compat
     qtsvg

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";
 }

pkgs/kde/gear/kimagemapeditor/default.nix

@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "kimagemapeditor";
 
-  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
-
   meta.mainProgram = "kimagemapeditor";
 }

pkgs/kde/gear/kirigami-gallery/default.nix

@@ -1,9 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  qttools,
 }:
 mkKdeDerivation {
   pname = "kirigami-gallery";
 
-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qtsvg
+    qttools
+  ];
 }

pkgs/kde/gear/klettres/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "klettres";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
-
   meta.mainProgram = "klettres";
 }

pkgs/kde/gear/kmime/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   ki18n,
 }:
 mkKdeDerivation {
   pname = "kmime";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ ki18n ];
 }

pkgs/kde/gear/kmousetool/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "kmousetool";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     xorg.libXt
   ];
-
   meta.mainProgram = "kmousetool";
 }

pkgs/kde/gear/kmouth/default.nix

@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "kmouth";
 
-  extraNativeBuildInputs = [ qtspeech ];
   extraBuildInputs = [ qtspeech ];
-
   meta.mainProgram = "kmouth";
 }

pkgs/kde/gear/koko/default.nix

@@ -37,11 +37,7 @@ mkKdeDerivation {
     ./optional-runtime-dependencies.patch
   ];
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtpositioning
-  ];
-
   extraBuildInputs = [
     qtmultimedia
     qtpositioning

pkgs/kde/gear/konqueror/default.nix

@@ -6,11 +6,7 @@
 mkKdeDerivation {
   pname = "konqueror";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ hunspell ];
-    hunspell
-    qtwebengine
-  ];
-
   extraBuildInputs = [ qtwebengine ];
 
   extraCmakeFlags = [

pkgs/kde/gear/konquest/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "konquest";
 
-  extraNativeBuildInputs = [ qtscxml ];
-
   extraBuildInputs = [
     qtscxml
     qtsvg
   ];
-
   meta.mainProgram = "konquest";
 }

pkgs/kde/gear/konsole/default.nix

@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "konsole";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qt5compat
     qtmultimedia

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";
 }

pkgs/kde/gear/krecorder/default.nix

@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "krecorder";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
-
   meta.mainProgram = "krecorder";
 }

pkgs/kde/gear/ksirk/default.nix

@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "ksirk";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
 }

pkgs/kde/gear/ktorrent/default.nix

@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "ktorrent";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtwebengine
     taglib

pkgs/kde/gear/ktuberling/default.nix

@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "ktuberling";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
-
   meta.mainProgram = "ktuberling";
 }

pkgs/kde/gear/kunifiedpush/default.nix

@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "kunifiedpush";
 
-  extraNativeBuildInputs = [ qtwebsockets ];
-
   extraBuildInputs = [
     qtwebsockets
     kdeclarative

pkgs/kde/gear/kwave/default.nix

@@ -19,11 +19,7 @@
 mkKdeDerivation {
   pname = "kwave";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtmultimedia
-  ];
-
   extraBuildInputs = [
     qtmultimedia
 

pkgs/kde/gear/kweather/default.nix

@@ -7,13 +7,10 @@
 mkKdeDerivation {
   pname = "kweather";
 
-  extraNativeBuildInputs = [ qtcharts ];
-
   extraBuildInputs = [
     qtsvg
     qtcharts
     kholidays
   ];
-
   meta.mainProgram = "kweather";
 }

pkgs/kde/gear/kweathercore/default.nix

@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kweathercore";
 
-  extraNativeBuildInputs = [ qtpositioning ];
   extraBuildInputs = [ qtpositioning ];
 }

pkgs/kde/gear/kwordquiz/default.nix

@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "kwordquiz";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia
   ];
-
   meta.mainProgram = "kwordquiz";
 }

pkgs/kde/gear/libkdepim/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "libkdepim";
+
+  extraNativeBuildInputs = [ qttools ];
 }

pkgs/kde/gear/libksieve/default.nix

@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "libksieve";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtwebengine
     cyrus_sasl

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

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 ];
 }

pkgs/kde/gear/merkuro/default.nix

@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "merkuro";
 
-  extraNativeBuildInputs = [ qtlocation ];
-
   extraBuildInputs = [
     qtlocation
     qtsvg

pkgs/kde/gear/messagelib/default.nix

@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "messagelib";
 
-  propagatedNativeBuildInputs = [ qtwebengine ];
   extraPropagatedBuildInputs = [ qtwebengine ];
 }

pkgs/kde/gear/okular/default.nix

@@ -14,11 +14,7 @@
 mkKdeDerivation {
   pname = "okular";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtspeech
-  ];
-
   extraBuildInputs = [
     qtspeech
     qtsvg

pkgs/kde/gear/parley/default.nix

@@ -7,16 +7,10 @@
 mkKdeDerivation {
   pname = "parley";
 
-  extraNativeBuildInputs = [
-    qtmultimedia
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia
     qtwebengine
   ];
-
   meta.mainProgram = "parley";
 }

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";
 }

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

pkgs/kde/gear/tokodon/default.nix

@@ -10,11 +10,7 @@
 mkKdeDerivation {
   pname = "tokodon";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwebsockets
-  ];
-
   extraBuildInputs = [
     qtmultimedia
     qtsvg

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 ];
 }

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

pkgs/kde/misc/klevernotes/default.nix

@@ -16,8 +16,6 @@ mkKdeDerivation rec {
     hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I=";
   };
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtsvg
     qtwebengine

pkgs/kde/misc/ktextaddons/default.nix

@@ -16,10 +16,6 @@ mkKdeDerivation rec {
     hash = "sha256-2YRlBaUvl72mTq0ZMDK8KVc+wxSB9HO+PFhvW4Mh7Nw=";
   };
 
-  extraNativeBuildInputs = [
-    qtspeech
-  ];
-
   extraBuildInputs = [
     qtspeech
     qttools

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 = [

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"

pkgs/kde/plasma/discover/default.nix

@@ -15,11 +15,7 @@ mkKdeDerivation {
     ./qml-deps.patch
   ];
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwebview
-  ];
-
   extraBuildInputs = [
     qtwebview
     discount

pkgs/kde/plasma/kdeplasma-addons/default.nix

@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kdeplasma-addons";
 
-  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
 }

pkgs/kde/plasma/krdp/default.nix

@@ -16,13 +16,9 @@ mkKdeDerivation {
     })
   ];
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwayland
-  ];
-
   extraBuildInputs = [
-    freerdp
     qtwayland
+    freerdp
   ];
 }

pkgs/kde/plasma/kscreen/default.nix

@@ -9,10 +9,7 @@
 mkKdeDerivation {
   pname = "kscreen";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtsensors
-  ];
 
   extraBuildInputs = [
     qtsensors

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

pkgs/kde/plasma/kwin/default.nix

@@ -40,10 +40,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     python3
-    qtsensors
-    qtwayland
   ];
-
   extraBuildInputs = [
     qtquick3d
     qtsensors

pkgs/kde/plasma/layer-shell-qt/default.nix

@@ -6,10 +6,6 @@
 mkKdeDerivation {
   pname = "layer-shell-qt";
 
-  extraNativeBuildInputs = [
+  extraNativeBuildInputs = [ pkg-config ];
-    pkg-config
-    qtwayland
-  ];
-
   extraBuildInputs = [ qtwayland ];
 }

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