kdePackages: Frameworks 6.14 -> 6.15, Plasma 6.3.5 -> 6.4 (#407400)

2025-06-17 18:07:07 +03:00
parent 86035c1268 1cccb99d45
commit c2b95b6106
143 changed files with 2076 additions and 1535 deletions
@@ -62,6 +62,9 @@ OK_MISSING_BY_PACKAGE = {
    "krfb": {
        "Qt6XkbCommonSupport",  # not real
    },
+    "ksystemstats": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
    "kuserfeedback": {
        "Qt6Svg",  # all used for backend console stuff we don't ship
        "QmlLint",
@@ -75,6 +78,9 @@ OK_MISSING_BY_PACKAGE = {
        "display-info",  # newer versions identify as libdisplay-info
        "Libcap",  # used to call setcap at build time and nothing else
    },
+    "kwin-x11": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
    "libksysguard": {
        "Libcap",  # used to call setcap at build time and nothing else
    },
@@ -84,6 +90,12 @@ OK_MISSING_BY_PACKAGE = {
    },
    "plasma-desktop": {
        "scim",  # upstream is dead, not packaged in Nixpkgs
+        "KAccounts6",  # dead upstream
+        "AccountsQt6",  # dead upstream
+        "signon-oauth2plugin",  # dead upstream
+    },
+    "plasma-dialer": {
+        "KTactileFeedback",  # dead?
    },
    "poppler-qt6": {
        "gobject-introspection-1.0",  # we don't actually want to build the GTK variant
@@ -156,8 +156,10 @@ in
        ];
        optionalPackages =
          [
+            aurorae
            plasma-browser-integration
            konsole
+            kwin-x11
            (lib.getBin qttools) # Expose qdbus in PATH
            ark
            elisa
@@ -339,8 +341,35 @@ in
        capabilities = "cap_sys_nice+ep";
        source = "${lib.getBin pkgs.kdePackages.kwin}/bin/kwin_wayland";
      };
+
+      ksystemstats_intel_helper = {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_perfmon+ep";
+        source = "${pkgs.kdePackages.ksystemstats}/libexec/ksystemstats_intel_helper";
+      };
+
+      ksgrd_network_helper = {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_net_raw+ep";
+        source = "${pkgs.kdePackages.libksysguard}/libexec/ksysguard/ksgrd_network_helper";
+      };
    };

+    # Upstream recommends allowing set-timezone and set-ntp so that the KCM and
+    # the automatic timezone logic work without user interruption.
+    # However, on NixOS NTP cannot be overwritten via dbus, and timezone
+    # can only be set if `time.timeZone` is set to `null`. So, we only allow
+    # set-timezone, and we only allow it when the timezone can actually be set.
+    security.polkit.extraConfig = lib.mkIf (config.time.timeZone != null) ''
+      polkit.addRule(function(action, subject) {
+        if (action.id == "org.freedesktop.timedate1.set-timezone" && subject.active) {
+          return polkit.Result.YES;
+        }
+      });
+    '';
+
    programs.dconf.enable = true;

    programs.firefox.nativeMessagingHosts.packages = [ kdePackages.plasma-browser-integration ];
@@ -101,6 +101,7 @@
  libetonyek,
  liborcus,
  libpng,
+  libxcrypt,
  langs ? [
    "ar"
    "ca"
@@ -378,16 +379,34 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig
  '';

-  nativeBuildInputs = [
-    autoconf
-    automake
-    bison
-    fontforge
-    gdb
-    jdk21
-    libtool
-    pkg-config
-  ];
+  nativeBuildInputs =
+    [
+      ant
+      autoconf
+      automake
+      bison
+      flex
+      fontforge
+      gdb
+      gettext
+      gperf
+      icu
+      jdk21
+      libmysqlclient
+      libtool
+      libxml2
+      libxslt
+      perl
+      perlPackages.ArchiveZip
+      perlPackages.IOCompress
+      pkg-config
+      python311
+      unzip
+      zip
+    ]
+    ++ optionals kdeIntegration [
+      qtbase
+    ];

  buildInputs =
    finalAttrs.passthru.gst_packages
@@ -397,11 +416,8 @@ stdenv.mkDerivation (finalAttrs: {
      # propagated libpng
      # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html
      (libpng.override { apngSupport = false; })
-      perlPackages.ArchiveZip
      coinmp
-      perlPackages.IOCompress
      abseil-cpp
-      ant
      bluez5
      boost
      box2d_2
@@ -414,15 +430,12 @@ stdenv.mkDerivation (finalAttrs: {
      dbus-glib
      expat
      file
-      flex
      fontconfig
      freetype
      getopt
-      gettext
      glib
      glm
      adwaita-icon-theme
-      gperf
      gpgme
      graphite2
      gtk3
@@ -433,6 +446,7 @@ stdenv.mkDerivation (finalAttrs: {
      lcms2
      libGL
      libGLU
+      libtool
      xorg.libX11
      xorg.libXaw
      xorg.libXdmcp
@@ -454,7 +468,6 @@ stdenv.mkDerivation (finalAttrs: {
      liblangtag
      libmspack
      libmwaw
-      libmysqlclient
      libodfgen
      liborcus
      xorg.libpthreadstubs
@@ -466,6 +479,7 @@ stdenv.mkDerivation (finalAttrs: {
      libwpd
      libwpg
      libwps
+      libxcrypt
      libxml2
      xorg.libxshmfence
      libxslt
@@ -481,17 +495,14 @@ stdenv.mkDerivation (finalAttrs: {
      openldap
      openssl
      pam
-      perl
      poppler
      libpq
      python311
      sane-backends
      unixODBC
-      unzip
      util-linux
      which
      xmlsec
-      zip
      zlib
    ]
    ++ optionals kdeIntegration [
@@ -691,6 +702,8 @@ stdenv.mkDerivation (finalAttrs: {
  # Wrapping is done in ./wrapper.nix
  dontWrapQtApps = true;

+  strictDeps = true;
+
  passthru = {
    inherit srcs;
    jdk = jre';
@@ -94,6 +94,11 @@ 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>,
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
    cmake
  ];

+  dontWrapQtApps = true;
+
  meta = {
    description = "Shared assets for OpenCloud desktop shell integrations";
    homepage = "https://github.com/opencloud-eu/desktop-shell-integration-resources";
@@ -12,8 +12,10 @@
  libsoup_3,
  openssl,
  pkg-config,
+  qt6,
  rustPlatform,
  webkitgtk_4_1,
+  wrapGAppsHook4,
  graphene,
  nix-update-script,
  versionCheckHook,
@@ -34,6 +36,8 @@ rustPlatform.buildRustPackage rec {
  nativeBuildInputs = [
    iproute2
    pkg-config
+    qt6.wrapQtAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
@@ -66,6 +70,12 @@ 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";
@@ -64,6 +64,8 @@ stdenv.mkDerivation rec {
    xf86inputlibinput.dev
  ];

+  cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ];
+
  postPatch = ''
    substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \
      --replace-fail 'QStringLiteral("gsettings' \
@@ -57,6 +57,13 @@ stdenv.mkDerivation (finalAttrs: {

  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";

+  # Qt Designer plugin moved to a separate output to reduce closure size
+  # for downstream things
+  outputs = [
+    "out"
+    "devtools"
+  ];
+
  # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
  # reside in the same directory as QtCore.framework, which is not true for Nix.
  # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked").
@@ -109,6 +116,9 @@ stdenv.mkDerivation (finalAttrs: {
    cd ../../..
    ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6
    cp -r PySide6.egg-info $out/${python.sitePackages}/
+
+    mkdir -p "$devtools"
+    moveToOutput "${python.pkgs.qt6.qtbase.qtPluginPrefix}/designer" "$devtools"
  '';

  pythonImportsCheck = [ "PySide6" ];
@@ -3,7 +3,6 @@
  generateSplicesForMkScope,
  makeScopeWithSplicing',
  fetchurl,
-  libsForQt5,
  qt6Packages,
  cmark,
  gpgme,
@@ -38,6 +37,8 @@ let
          inherit (v) version;
        }
      ) allUrls;
+
+      debugAlias = set: lib.dontRecurseIntoAttrs (lib.filterAttrs (k: v: !v.meta.broken) set);
    in
    (
      qt6Packages
@@ -47,6 +48,11 @@ let
      // {
        inherit sources;

+        # Aliases to simplify test-building entire package sets
+        frameworks = debugAlias frameworks;
+        gear = debugAlias gear;
+        plasma = debugAlias plasma;
+
        mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { };

        # THIRD PARTY
@@ -62,9 +68,6 @@ let
        # Alias to match metadata
        kquickimageeditor = self.kquickimageedit;

-        # Alias because it's just data
-        plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
-
        selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub

        alpaka = self.callPackage ./misc/alpaka { };
@@ -82,6 +85,7 @@ let
        oxygen-icons = self.callPackage ./misc/oxygen-icons { };
        phonon = self.callPackage ./misc/phonon { };
        phonon-vlc = self.callPackage ./misc/phonon-vlc { };
+        plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { };
        polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };
        pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };

@@ -19,4 +19,7 @@ mkKdeDerivation {

  # lots of icons, takes forever, does absolutely nothing
  dontStrip = true;
+
+  # known upstream issue: https://invent.kde.org/frameworks/breeze-icons/-/commit/135e59fb4395c1779a52ab113cc70f7baa53fd5d
+  dontCheckForBrokenSymlinks = true;
 }
@@ -1,16 +1,20 @@
 {
  mkKdeDerivation,
  python3,
+  qttools,
 }:
 mkKdeDerivation {
  pname = "extra-cmake-modules";

  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;
@@ -104,10 +104,5 @@ ecmHostPathHook() {
            break
        fi
    done
-
-    if [ -d "$1/share/dbus-1" ]
-    then
-        appendToVar propagatedUserEnvPkgs "$1"
-    fi
 }
 addEnvHooks "$hostOffset" ecmHostPathHook
@@ -1,4 +1,7 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
  pname = "kapidox";
+
+  # doesn't actually install anything - good thing it's unused
+  meta.broken = true;
 }
@@ -1,15 +1,11 @@
 {
  mkKdeDerivation,
-  qttools,
  pkg-config,
  xz,
 }:
 mkKdeDerivation {
  pname = "karchive";

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

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

-  extraNativeBuildInputs = [ qttools ];
  extraPropagatedBuildInputs = [ qtdeclarative ];
 }
@@ -1,14 +1,14 @@
 {
  mkKdeDerivation,
-  qttools,
  shared-mime-info,
  qtdeclarative,
 }:
 mkKdeDerivation {
  pname = "kcoreaddons";

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

-  extraNativeBuildInputs = [ qttools ];
  extraBuildInputs = [ avahi ];
 }
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
  pname = "kglobalaccel";
-
-  extraNativeBuildInputs = [ qttools ];
 }
@@ -7,6 +7,8 @@
 mkKdeDerivation {
  pname = "kguiaddons";

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

-  extraNativeBuildInputs = [ qttools ];
  extraBuildInputs = [ qtdeclarative ];
 }
@@ -2,7 +2,6 @@
  stdenv,
  mkKdeDerivation,
  qtsvg,
-  qttools,
  qtdeclarative,
  qt5compat,
  qqc2-desktop-style,
@@ -17,12 +16,11 @@ let
  unwrapped = mkKdeDerivation {
    pname = "kirigami";

-    extraNativeBuildInputs = [
-      qtsvg
-      qttools
-    ];
+    extraNativeBuildInputs = [ qtsvg ];
    extraBuildInputs = [ qtdeclarative ];
+
    extraPropagatedBuildInputs = [ qt5compat ];
+    propagatedNativeBuildInputs = [ qt5compat ];
  };
 in
 stdenv.mkDerivation {
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
  pname = "kitemviews";
-
-  extraNativeBuildInputs = [ qttools ];
 }
@@ -1,9 +1,8 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 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,13 +1,13 @@
 {
  mkKdeDerivation,
-  qttools,
  qtdeclarative,
  libcanberra,
 }:
 mkKdeDerivation {
  pname = "knotifications";

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

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

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

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

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

  extraNativeBuildInputs = [
-    qttools
    pkg-config
  ];
  extraBuildInputs = [
@@ -5,5 +5,7 @@
 mkKdeDerivation {
  pname = "kxmlgui";

+  hasPythonBindings = true;
+
  extraBuildInputs = [ qttools ];
 }
@@ -8,9 +8,11 @@
 mkKdeDerivation {
  pname = "prison";

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

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

  extraNativeBuildInputs = [
-    qttools
    bison
    flex
  ];
@@ -1,7 +1,6 @@
 {
  mkKdeDerivation,
  qtdeclarative,
-  qttools,
  pkg-config,
  aspell,
  hunspell,
@@ -9,10 +8,7 @@
 mkKdeDerivation {
  pname = "sonnet";

-  extraNativeBuildInputs = [
-    qttools
-    pkg-config
-  ];
+  extraNativeBuildInputs = [ pkg-config ];
  extraBuildInputs = [
    qtdeclarative
    aspell
@@ -1,16 +1,12 @@
 {
  mkKdeDerivation,
  qtdeclarative,
-  qttools,
  perl,
 }:
 mkKdeDerivation {
  pname = "syntax-highlighting";

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

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

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

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

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

  extraNativeBuildInputs = [
    ps.pybind11
+    qtmultimedia
  ];

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

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

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

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

-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwebchannel
+    qtwebengine
+  ];
+
  extraBuildInputs = [
    qtsvg
    qttools
@@ -3,6 +3,7 @@
  qtsvg,
  qtwayland,
  qtimageformats,
+  phonon,
  pkg-config,
  cfitsio,
  exiv2,
@@ -14,13 +15,19 @@
 mkKdeDerivation {
  pname = "gwenview";

-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwayland
+  ];
+
  extraBuildInputs = [
    qtsvg
    qtwayland
    # adds support for webp and other image formats
    qtimageformats

+    phonon
+
    cfitsio
    exiv2
    baloo
@@ -15,11 +15,14 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    shared-mime-info
+    qtpositioning
  ];
+
  extraBuildInputs = [
    qtlocation
    qtpositioning
    libical
  ];
+
  meta.mainProgram = "itinerary";
 }
@@ -1,6 +1,7 @@
 {
  mkKdeDerivation,
  qtsvg,
+  phonon,
  taglib,
 }:
 mkKdeDerivation {
@@ -8,7 +9,9 @@ mkKdeDerivation {

  extraBuildInputs = [
    qtsvg
+    phonon
    taglib
  ];
+
  meta.mainProgram = "juk";
 }
@@ -27,6 +27,7 @@ mkKdeDerivation {
  extraNativeBuildInputs = [
    pkg-config
    shared-mime-info
+    qtwebengine
  ];

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

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

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

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

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

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

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

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

  extraBuildInputs = [
@@ -18,7 +18,9 @@ mkKdeDerivation {
    pkg-config
    shared-mime-info
    libxslt
+    qtnetworkauth
  ];
+
  # FIXME: libkolabxml
  extraBuildInputs = [
    qtnetworkauth
@@ -1,4 +1,6 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+}:
 mkKdeDerivation {
  pname = "kdev-python";
 }
@@ -23,10 +23,6 @@ mkKdeDerivation {
    shared-mime-info
  ];

-  extraPropagatedBuildInputs = [
-    qtwebengine
-  ];
-
  extraBuildInputs = [
    qttools
    apr
@@ -38,6 +34,9 @@ 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,7 +9,11 @@
 mkKdeDerivation {
  pname = "kgraphviewer";

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

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

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

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

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

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

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

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

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

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

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

+  extraNativeBuildInputs = [ qtmultimedia ];
+
  extraBuildInputs = [
    qt5compat
    qtmultimedia
@@ -1,6 +1,5 @@
 {
  mkKdeDerivation,
-  qttools,
  qtmultimedia,
  qt5compat,
 }:
@@ -8,10 +7,7 @@ mkKdeDerivation {
  pname = "konversation";

  extraBuildInputs = [ qt5compat ];
-  extraNativeBuildInputs = [
-    qtmultimedia
-    qttools
-  ];
+  extraNativeBuildInputs = [ qtmultimedia ];

  meta.mainProgram = "konversation";
 }
@@ -5,6 +5,8 @@
 mkKdeDerivation {
  pname = "krecorder";

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

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

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

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

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

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

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

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

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

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

+  extraNativeBuildInputs = [ qtwebengine ];
+
  extraBuildInputs = [
    qtwebengine
    cyrus_sasl
@@ -6,6 +6,7 @@
  shared-mime-info,

  qtpositioning,
+  qtserialport,
  qtsvg,
  qttools,
  qtwebengine,
@@ -25,10 +26,14 @@ mkKdeDerivation {
    perl
    pkg-config
    shared-mime-info
+    qtpositioning
+    qtserialport
+    qtwebengine
  ];

  extraBuildInputs = [
    qtpositioning
+    qtserialport
    qtsvg
    qttools
    qtwebengine
@@ -7,9 +7,13 @@
 mkKdeDerivation {
  pname = "massif-visualizer";

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

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

+  propagatedNativeBuildInputs = [ qtwebengine ];
  extraPropagatedBuildInputs = [ qtwebengine ];
 }
@@ -2,7 +2,6 @@
  mkKdeDerivation,
  qtlocation,
  qtwebview,
-  kunifiedpush,
 }:
 mkKdeDerivation {
  pname = "neochat";
@@ -10,7 +9,6 @@ mkKdeDerivation {
  extraBuildInputs = [
    qtlocation
    qtwebview
-    kunifiedpush
  ];
  meta.mainProgram = "neochat";
 }
@@ -14,7 +14,11 @@
 mkKdeDerivation {
  pname = "okular";

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

+  extraNativeBuildInputs = [
+    qtmultimedia
+    qtwebengine
+  ];
+
  extraBuildInputs = [
    qtsvg
    qtmultimedia
    qtwebengine
  ];
+
  meta.mainProgram = "parley";
 }
--- a/Show More
+++ b/Show More