3 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index e9a333c98a199..31bce026daa0d 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -40,7 +40,7 @@ let
     mirror = "mirror://kde";
   };
 
-  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+  mkDerivation = libsForQt5.callPackage ({ stdenv, mkDerivation ? stdenv.mkDerivation }: mkDerivation) {};
 
   packages = self: with self;
     # SUPPORT
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index f790d802c0ca4..fbd6710994659 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,12 +1,21 @@
 {
-  mkDerivation,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qttools, shared-mime-info
 }:
 
-mkDerivation {
+mkDerivation ({
   pname = "kcoreaddons";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools shared-mime-info ];
   propagatedBuildInputs = [ qtbase ];
-}
+} // lib.optionalAttrs (lib.versionAtLeast qtbase.version "6") {
+  dontWrapQtApps = true;
+  cmakeFlags = [
+    "-DBUILD_WITH_QT6=ON"
+    "-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT"
+  ];
+  postInstall = ''
+    moveToOutput "mkspecs" "$dev"
+  '';
+})
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index e6f3b4ae5fd56..3320ff4ee2042 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -14,11 +14,20 @@
 let
   libsForQt6 = self;
   callPackage = self.callPackage;
+  kdeFrameworks = let
+    mkFrameworks = import ../development/libraries/kde-frameworks;
+    attrs = {
+      libsForQt5 = libsForQt6;
+      inherit (pkgs) lib fetchurl;
+    };
+  in (lib.makeOverridable mkFrameworks attrs);
 in
 
 (qt6 // {
   # LIBRARIES
 
+  inherit (kdeFrameworks) kcoreaddons;
+
   quazip = callPackage ../development/libraries/quazip { };
 
   poppler = callPackage ../development/libraries/poppler {