From 0fce2ea3f28da352df891f56aacb352bac7ccdd7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 18 Aug 2023 00:17:10 +0300
Subject: [PATCH] qt6Packages.kcoreaddons: drop

This doesn't build. This also shouldn't exist.
---
 .../libraries/kde-frameworks/kcoreaddons.nix   | 18 +++---------------
 pkgs/top-level/qt6-packages.nix                | 11 -----------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 3e0eeec617b6..f790d802c0ca 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,24 +1,12 @@
 {
-  mkDerivation, lib, stdenv,
+  mkDerivation,
   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"
-  '';
-} // lib.optionalAttrs stdenv.isDarwin {
-  # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327
-  env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0";
-})
+}
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 4fda684b54d6..792be6b3efda 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -13,24 +13,13 @@
 (lib.makeScope pkgs.newScope ( self:
 
 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 // {
   inherit stdenv;
 
   # LIBRARIES
 
-  inherit (kdeFrameworks) kcoreaddons;
-
   qt6ct = callPackage ../tools/misc/qt6ct { };
 
   qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { };