kdePackages: unpropagate qttools (#418164)

2025-06-19 20:18:02 +03:00
parent a52971ae50 dc7662a050
commit e04a26987a
109 changed files with 205 additions and 291 deletions
@@ -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>,
@@ -2,19 +2,11 @@
  fetchFromGitHub,
  glib,
  gtk4,
-  iproute2,
  kdePackages,
  lib,
-  libappindicator,
-  libappindicator-gtk2,
-  libappindicator-gtk3,
-  libayatana-appindicator,
-  libsoup_3,
  openssl,
  pkg-config,
-  qt6,
  rustPlatform,
-  webkitgtk_4_1,
  wrapGAppsHook4,
  graphene,
  nix-update-script,
@@ -34,9 +26,7 @@ rustPlatform.buildRustPackage rec {
  passthru.updateScript = nix-update-script { };

  nativeBuildInputs = [
-    iproute2
    pkg-config
-    qt6.wrapQtAppsHook
    wrapGAppsHook4
  ];

@@ -44,13 +34,7 @@ rustPlatform.buildRustPackage rec {
    glib
    gtk4
    kdePackages.kstatusnotifieritem
-    libappindicator
-    libappindicator-gtk2
-    libappindicator-gtk3
-    libayatana-appindicator
-    libsoup_3
    openssl
-    webkitgtk_4_1
    graphene
  ];

@@ -70,12 +54,6 @@ rustPlatform.buildRustPackage rec {
  versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
  versionCheckProgramArg = "--version";

-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  dontWrapGApps = true;
-
  meta = {
    description = "Open source Linux client for Checkpoint VPN tunnels";
    homepage = "https://github.com/ancwrd1/snx-rs";
@@ -1,20 +1,20 @@
 {
  mkKdeDerivation,
  python3,
-  qttools,
 }:
 mkKdeDerivation {
  pname = "extra-cmake-modules";

+  # Don't depend on qdoc (leaks everywhere, causes random cross issues), we don't install the docs anyway
+  # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/534
+  patches = [ ./no-qdoc.patch ];
+
  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;
@@ -0,0 +1,20 @@
+diff --git a/modules/ECMGenerateQDoc.cmake b/modules/ECMGenerateQDoc.cmake
+index b6d64783314de790a5444c3c0d125b8e455883d9..68c570506fdc118ddef6249bce78051569298b4c 100644
+--- a/modules/ECMGenerateQDoc.cmake
+++ b/modules/ECMGenerateQDoc.cmake
+@@ -55,8 +55,13 @@ add_custom_target(generate_qch)
+ add_custom_target(install_qch_docs)
+ 
+ function(ecm_generate_qdoc target qdocconf_file)
+-    find_package(Qt6Tools CONFIG REQUIRED)
+-    find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED)
+    find_package(Qt6Tools CONFIG QUIET)
+    find_package(Qt6 OPTIONAL_COMPONENTS ToolsTools CONFIG QUIET)
+
+    if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND)
+        message(STATUS "Qt6Tools or Qt6ToolsTools not found, not generating API documentation")
+        return()
+    endif()
+ 
+     if (NOT TARGET ${target})
+         message(FATAL_ERROR "${target} is not a target")
@@ -1,11 +1,15 @@
 {
  mkKdeDerivation,
+  qttools,
  pkg-config,
  xz,
 }:
 mkKdeDerivation {
  pname = "karchive";

-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    qttools
+    pkg-config
+  ];
  extraBuildInputs = [ xz ];
 }
@@ -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 ];
 }
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
  pname = "kbookmarks";
+
+  extraNativeBuildInputs = [ qttools ];
 }
@@ -1,11 +1,13 @@
 {
  mkKdeDerivation,
+  qttools,
  gperf,
 }:
 mkKdeDerivation {
  pname = "kcodecs";

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

+  extraNativeBuildInputs = [ qttools ];
  extraPropagatedBuildInputs = [ qtdeclarative ];
 }
@@ -1,5 +1,6 @@
 {
  mkKdeDerivation,
+  qttools,
  shared-mime-info,
  qtdeclarative,
 }:
@@ -9,6 +10,7 @@ mkKdeDerivation {
  hasPythonBindings = true;

  extraNativeBuildInputs = [
+    qttools
    shared-mime-info
  ];
  extraBuildInputs = [ qtdeclarative ];
@@ -1,5 +1,10 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
  pname = "kdbusaddons";
+
+  extraNativeBuildInputs = [ qttools ];
  meta.mainProgram = "kquitapp6";
 }
@@ -1,9 +1,11 @@
 {
  mkKdeDerivation,
+  qttools,
  avahi,
 }:
 mkKdeDerivation {
  pname = "kdnssd";

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

+  extraNativeBuildInputs = [ qttools ];
  extraBuildInputs = [ qtdeclarative ];
 }
@@ -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 {
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
  pname = "kitemviews";
+
+  extraNativeBuildInputs = [ qttools ];
 }
@@ -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" ];
@@ -1,5 +1,6 @@
 {
  mkKdeDerivation,
+  qttools,
  qtdeclarative,
  libcanberra,
 }:
@@ -8,6 +9,7 @@ mkKdeDerivation {

  hasPythonBindings = true;

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

  hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }
@@ -7,8 +7,6 @@
 mkKdeDerivation {
  pname = "ktexteditor";

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

-  extraNativeBuildInputs = [ qtspeech ];
-
  extraBuildInputs = [
    qtspeech
    qttools
@@ -1,5 +1,6 @@
 {
  mkKdeDerivation,
+  qttools,
  qtsvg,
 }:
 mkKdeDerivation {
@@ -10,5 +11,8 @@ mkKdeDerivation {
    "-DENABLE_CONSOLE=0"
    "-DENABLE_CLI=0"
  ];
-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qttools
+    qtsvg
+  ];
 }
@@ -1,6 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
  pname = "kwidgetsaddons";

  hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }
@@ -1,5 +1,6 @@
 {
  mkKdeDerivation,
+  qttools,
  qtdeclarative,
  qtwayland,
  pkg-config,
@@ -8,6 +9,7 @@ mkKdeDerivation {
  pname = "kwindowsystem";

  extraNativeBuildInputs = [
+    qttools
    pkg-config
  ];
  extraBuildInputs = [
@@ -8,11 +8,9 @@
 mkKdeDerivation {
  pname = "prison";

-  propagatedNativeBuildInputs = [ qtmultimedia ];
-  extraPropagatedBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qtdeclarative
+    qtmultimedia
    qrencode
    libdmtx
  ];
@@ -1,11 +1,13 @@
 {
  mkKdeDerivation,
  qtdeclarative,
+  qttools,
  kirigami,
 }:
 mkKdeDerivation {
  pname = "qqc2-desktop-style";

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

  extraNativeBuildInputs = [
+    qttools
    bison
    flex
  ];
@@ -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
@@ -1,12 +1,16 @@
 {
  mkKdeDerivation,
  qtdeclarative,
+  qttools,
  perl,
 }:
 mkKdeDerivation {
  pname = "syntax-highlighting";

  extraBuildInputs = [ qtdeclarative ];
-  extraNativeBuildInputs = [ perl ];
+  extraNativeBuildInputs = [
+    qttools
+    perl
+  ];
  meta.mainProgram = "ksyntaxhighlighter6";
 }
@@ -1,6 +1,7 @@
 {
  lib,
  mkKdeDerivation,
+  qttools,
  accounts-qt,
  kaccounts-integration,
  shared-mime-info,
@@ -35,6 +36,7 @@ mkKdeDerivation {
    ];

  extraNativeBuildInputs = [
+    qttools
    shared-mime-info
  ];

@@ -2,6 +2,7 @@
  mkKdeDerivation,
  qt5compat,
  qtsvg,
+  qttools,
  qtdeclarative,
  eigen,
 }:
@@ -11,6 +12,7 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    qt5compat
    qtsvg
+    qttools
  ];
  extraBuildInputs = [
    qtdeclarative
@@ -23,7 +23,6 @@ mkKdeDerivation rec {
    rustPlatform.cargoSetupHook
    cargo
    rustc
-    qtwebengine
  ];

  extraBuildInputs = [
@@ -9,12 +9,6 @@
 mkKdeDerivation {
  pname = "arianna";

-  extraNativeBuildInputs = [
-    qthttpserver
-    qtwebchannel
-    qtwebengine
-  ];
-
  extraBuildInputs = [
    qthttpserver
    qtsvg
@@ -22,6 +16,5 @@ mkKdeDerivation {
    qtwebengine
    kitemmodels
  ];
-
  meta.mainProgram = "arianna";
 }
@@ -27,7 +27,6 @@ mkKdeDerivation {

  extraNativeBuildInputs = [
    ps.pybind11
-    qtmultimedia
  ];

  extraBuildInputs = [
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "blinken";

-  extraNativeBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qtmultimedia
    qtsvg
  ];
-
  meta.mainProgram = "blinken";
 }
@@ -19,9 +19,7 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    shared-mime-info
-    qtwebengine
  ];
-
  extraBuildInputs = [
    qtsvg
    qttools
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "elisa";

-  extraNativeBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qtmultimedia
    libvlc
  ];
-
  meta.mainProgram = "elisa";
 }
@@ -3,12 +3,14 @@
  extra-cmake-modules,
  qtwebchannel,
  qtwebengine,
+  qttools,
  python3Packages,
 }:
 mkKdeDerivation {
  pname = "falkon";

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

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

-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtsvg
    qtwayland
@@ -15,14 +15,11 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    shared-mime-info
-    qtpositioning
  ];
-
  extraBuildInputs = [
    qtlocation
    qtpositioning
    libical
  ];
-
  meta.mainProgram = "itinerary";
 }
@@ -27,7 +27,6 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    shared-mime-info
-    qtwebengine
  ];

  # FIXME: Musicbrainz 2.x???, musepack
@@ -7,11 +7,7 @@
 mkKdeDerivation {
  pname = "kaccounts-providers";

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

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

-  extraNativeBuildInputs = [
-    pkg-config
-    qtmultimedia
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtsvg
    qtmultimedia
@@ -1,11 +1,14 @@
 {
  lib,
  mkKdeDerivation,
+  qttools,
  graphviz,
 }:
 mkKdeDerivation {
  pname = "kcachegrind";

+  extraNativeBuildInputs = [ qttools ];
+
  qtWrapperArgs = [
    "--suffix PATH : ${lib.makeBinPath [ graphviz ]}"
  ];
@@ -6,8 +6,6 @@
 mkKdeDerivation {
  pname = "kclock";

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

-  extraNativeBuildInputs = [
-    pkg-config
-    qtconnectivity
-    qtmultimedia
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtconnectivity
    qtmultimedia
@@ -5,6 +5,5 @@
 mkKdeDerivation {
  pname = "kdegraphics-mobipocket";

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

  extraBuildInputs = [
@@ -18,9 +18,7 @@ mkKdeDerivation {
    pkg-config
    shared-mime-info
    libxslt
-    qtnetworkauth
  ];
-
  # FIXME: libkolabxml
  extraBuildInputs = [
    qtnetworkauth
@@ -1,6 +1,4 @@
-{
-  mkKdeDerivation,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
  pname = "kdev-python";
 }
@@ -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"
@@ -9,11 +9,7 @@
 mkKdeDerivation {
  pname = "kgraphviewer";

-  extraNativeBuildInputs = [
-    pkg-config
-    qt5compat
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qt5compat
    qtsvg
@@ -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";
 }
@@ -5,8 +5,6 @@
 mkKdeDerivation {
  pname = "kimagemapeditor";

-  extraNativeBuildInputs = [ qtwebengine ];
  extraBuildInputs = [ qtwebengine ];
-
  meta.mainProgram = "kimagemapeditor";
 }
@@ -1,9 +1,13 @@
 {
  mkKdeDerivation,
  qtsvg,
+  qttools,
 }:
 mkKdeDerivation {
  pname = "kirigami-gallery";

-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qtsvg
+    qttools
+  ];
 }
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "klettres";

-  extraNativeBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qtmultimedia
    qtsvg
  ];
-
  meta.mainProgram = "klettres";
 }
@@ -1,9 +1,11 @@
 {
  mkKdeDerivation,
+  qttools,
  ki18n,
 }:
 mkKdeDerivation {
  pname = "kmime";

+  extraNativeBuildInputs = [ qttools ];
  extraBuildInputs = [ ki18n ];
 }
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "kmousetool";

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

-  extraNativeBuildInputs = [ qtspeech ];
  extraBuildInputs = [ qtspeech ];
-
  meta.mainProgram = "kmouth";
 }
@@ -37,11 +37,7 @@ mkKdeDerivation {
    ./optional-runtime-dependencies.patch
  ];

-  extraNativeBuildInputs = [
-    pkg-config
-    qtpositioning
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtmultimedia
    qtpositioning
@@ -6,11 +6,7 @@
 mkKdeDerivation {
  pname = "konqueror";

-  extraNativeBuildInputs = [
-    hunspell
-    qtwebengine
-  ];
-
+  extraNativeBuildInputs = [ hunspell ];
  extraBuildInputs = [ qtwebengine ];

  extraCmakeFlags = [
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "konquest";

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

-  extraNativeBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qt5compat
    qtmultimedia
@@ -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";
 }
@@ -5,8 +5,6 @@
 mkKdeDerivation {
  pname = "krecorder";

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

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

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

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

-  extraNativeBuildInputs = [ qtwebsockets ];
-
  extraBuildInputs = [
    qtwebsockets
    kdeclarative
@@ -19,11 +19,7 @@
 mkKdeDerivation {
  pname = "kwave";

-  extraNativeBuildInputs = [
-    pkg-config
-    qtmultimedia
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtmultimedia

@@ -7,13 +7,10 @@
 mkKdeDerivation {
  pname = "kweather";

-  extraNativeBuildInputs = [ qtcharts ];
-
  extraBuildInputs = [
    qtsvg
    qtcharts
    kholidays
  ];
-
  meta.mainProgram = "kweather";
 }
@@ -5,6 +5,5 @@
 mkKdeDerivation {
  pname = "kweathercore";

-  extraNativeBuildInputs = [ qtpositioning ];
  extraBuildInputs = [ qtpositioning ];
 }
@@ -6,12 +6,9 @@
 mkKdeDerivation {
  pname = "kwordquiz";

-  extraNativeBuildInputs = [ qtmultimedia ];
-
  extraBuildInputs = [
    qtsvg
    qtmultimedia
  ];
-
  meta.mainProgram = "kwordquiz";
 }
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
  pname = "libkdepim";
+
+  extraNativeBuildInputs = [ qttools ];
 }
@@ -6,8 +6,6 @@
 mkKdeDerivation {
  pname = "libksieve";

-  extraNativeBuildInputs = [ qtwebengine ];
-
  extraBuildInputs = [
    qtwebengine
    cyrus_sasl
@@ -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
@@ -7,13 +7,9 @@
 mkKdeDerivation {
  pname = "massif-visualizer";

-  extraNativeBuildInputs = [
-    shared-mime-info
-    qt5compat
-  ];
-
  extraBuildInputs = [
    qt5compat
    qtsvg
  ];
+  extraNativeBuildInputs = [ shared-mime-info ];
 }
@@ -7,8 +7,6 @@
 mkKdeDerivation {
  pname = "merkuro";

-  extraNativeBuildInputs = [ qtlocation ];
-
  extraBuildInputs = [
    qtlocation
    qtsvg
@@ -5,6 +5,5 @@
 mkKdeDerivation {
  pname = "messagelib";

-  propagatedNativeBuildInputs = [ qtwebengine ];
  extraPropagatedBuildInputs = [ qtwebengine ];
 }
@@ -14,11 +14,7 @@
 mkKdeDerivation {
  pname = "okular";

-  extraNativeBuildInputs = [
-    pkg-config
-    qtspeech
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtspeech
    qtsvg
@@ -7,16 +7,10 @@
 mkKdeDerivation {
  pname = "parley";

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

-  extraNativeBuildInputs = [
-    qtwebengine
-  ];
-
  extraBuildInputs = [
    qtwebengine
    (tesseract5.override { enableLanguages = tesseractLanguages; })
    leptonica
  ];
-
  meta.mainProgram = "skanpage";
 }
@@ -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
@@ -10,11 +10,7 @@
 mkKdeDerivation {
  pname = "tokodon";

-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebsockets
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtmultimedia
    qtsvg
@@ -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 ];
 }
@@ -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
@@ -16,8 +16,6 @@ mkKdeDerivation rec {
    hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I=";
  };

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

-  extraNativeBuildInputs = [
-    qtspeech
-  ];
-
  extraBuildInputs = [
    qtspeech
    qttools
@@ -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 = [
@@ -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"
@@ -15,11 +15,7 @@ mkKdeDerivation {
    ./qml-deps.patch
  ];

-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebview
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtwebview
    discount
@@ -5,6 +5,5 @@
 mkKdeDerivation {
  pname = "kdeplasma-addons";

-  extraNativeBuildInputs = [ qtwebengine ];
  extraBuildInputs = [ qtwebengine ];
 }
@@ -16,13 +16,9 @@ mkKdeDerivation {
    })
  ];

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

-  extraNativeBuildInputs = [
-    pkg-config
-    qtsensors
-  ];
+  extraNativeBuildInputs = [ pkg-config ];

  extraBuildInputs = [
    qtsensors
@@ -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
@@ -40,10 +40,7 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    python3
-    qtsensors
-    qtwayland
  ];
-
  extraBuildInputs = [
    qtquick3d
    qtsensors
--- a/Show More
+++ b/Show More