From 99d4380aaa526304685deafc77229dbe0a803f3d Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH] treewide: trim some leaves from KF5 We can't really drop all of this yet, but there's at least some progress here. --- .../libraries/kde-frameworks/baloo.nix | 53 ----- .../libraries/kde-frameworks/bluez-qt.nix | 24 --- .../libraries/kde-frameworks/default.nix | 188 +++++++++--------- .../libraries/kde-frameworks/kapidox.nix | 37 ---- .../libraries/kde-frameworks/kcontacts.nix | 33 --- .../libraries/kde-frameworks/kdav.nix | 33 --- .../kde-frameworks/kdesu/default.nix | 31 --- ...desu-search-for-wrapped-daemon-first.patch | 38 ---- .../kfilemetadata/cmake-install-paths.patch | 13 -- .../kde-frameworks/kfilemetadata/default.nix | 41 ---- .../libraries/kde-frameworks/kholidays.nix | 34 ---- .../libraries/kde-frameworks/khtml.nix | 53 ----- .../kde-frameworks/kimageformats.nix | 36 ---- .../libraries/kde-frameworks/kjs.nix | 24 --- .../libraries/kde-frameworks/kjsembed.nix | 23 --- .../libraries/kde-frameworks/kmediaplayer.nix | 15 -- .../libraries/kde-frameworks/kpeople.nix | 25 --- .../libraries/kde-frameworks/kpty.nix | 21 -- .../libraries/kde-frameworks/kquickcharts.nix | 15 -- .../libraries/kde-frameworks/kross.nix | 39 ---- .../libraries/kde-frameworks/ktexteditor.nix | 53 ----- .../kde-frameworks/kxmlrpcclient.nix | 17 -- .../kde-frameworks/modemmanager-qt.nix | 21 -- .../kde-frameworks/networkmanager-qt.nix | 22 -- .../libraries/kde-frameworks/oxygen-icons.nix | 14 -- .../libraries/kde-frameworks/prison.nix | 27 --- .../kde-frameworks/qqc2-desktop-style.nix | 21 -- pkgs/top-level/qt5-packages.nix | 1 + 28 files changed, 98 insertions(+), 854 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/baloo.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/bluez-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kapidox.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kcontacts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdav.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdesu/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kholidays.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/khtml.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kimageformats.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kjs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kjsembed.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kmediaplayer.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kpeople.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kpty.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kquickcharts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kross.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/ktexteditor.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/oxygen-icons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/prison.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix deleted file mode 100644 index b71c851dccd8..000000000000 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kauth, - kconfig, - kcoreaddons, - kcrash, - kdbusaddons, - kfilemetadata, - ki18n, - kidletime, - kio, - lmdb, - qtbase, - qtdeclarative, - solid, -}: - -mkDerivation { - pname = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kauth - kconfig - kcrash - kdbusaddons - ki18n - kio - kidletime - lmdb - qtdeclarative - solid - ]; - outputs = [ - "out" - "dev" - ]; - propagatedBuildInputs = [ - kcoreaddons - kfilemetadata - qtbase - ]; - - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` - # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one - # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) - postUnpack = '' - substituteInPlace "$sourceRoot"/src/file/kde-baloo.service.in \ - --replace @KDE_INSTALL_FULL_BINDIR@ /run/current-system/sw/bin - ''; - meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; -} diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix deleted file mode 100644 index a94d15596afb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - qtdeclarative, - udevCheckHook, -}: - -mkDerivation { - pname = "bluez-qt"; - nativeBuildInputs = [ - extra-cmake-modules - udevCheckHook - ]; - buildInputs = [ qtdeclarative ]; - propagatedBuildInputs = [ qtbase ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$bin/lib/udev/rules.d" - ''; - doInstallCheck = true; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 59b9c75804f2..1aad44bf359f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -23,6 +23,7 @@ */ { + config, libsForQt5, lib, fetchurl, @@ -134,103 +135,108 @@ let }; + mkThrow = + name: throw "libsForQt5.${name} has been removed, as KDE Frameworks 5 has reached end of life."; in - { - extra-cmake-modules = callPackage ./extra-cmake-modules { }; + ( + { + extra-cmake-modules = callPackage ./extra-cmake-modules { }; - # TIER 1 - attica = callPackage ./attica.nix { }; - bluez-qt = callPackage ./bluez-qt.nix { }; - breeze-icons = callPackage ./breeze-icons.nix { }; - kapidox = callPackage ./kapidox.nix { }; - karchive = callPackage ./karchive.nix { }; - kcalendarcore = callPackage ./kcalendarcore.nix { }; - kcodecs = callPackage ./kcodecs.nix { }; - kconfig = callPackage ./kconfig.nix { }; - kcoreaddons = callPackage ./kcoreaddons.nix { }; - kdbusaddons = callPackage ./kdbusaddons.nix { }; - kdnssd = callPackage ./kdnssd.nix { }; - kguiaddons = callPackage ./kguiaddons.nix { }; - kholidays = callPackage ./kholidays.nix { }; - ki18n = callPackage ./ki18n.nix { }; - kidletime = callPackage ./kidletime.nix { }; - kirigami2 = callPackage ./kirigami2.nix { }; - kitemmodels = callPackage ./kitemmodels.nix { }; - kitemviews = callPackage ./kitemviews.nix { }; - kplotting = callPackage ./kplotting.nix { }; - kquickcharts = callPackage ./kquickcharts.nix { }; - kwayland = callPackage ./kwayland.nix { }; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix { }; - kwindowsystem = callPackage ./kwindowsystem { }; - modemmanager-qt = callPackage ./modemmanager-qt.nix { }; - networkmanager-qt = callPackage ./networkmanager-qt.nix { }; - oxygen-icons = callPackage ./oxygen-icons.nix { }; - oxygen-icons5 = oxygen-icons; - prison = callPackage ./prison.nix { }; - qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix { }; - solid = callPackage ./solid { }; - sonnet = callPackage ./sonnet.nix { }; - syntax-highlighting = callPackage ./syntax-highlighting.nix { }; - threadweaver = callPackage ./threadweaver.nix { }; + # TIER 1 + attica = callPackage ./attica.nix { }; + breeze-icons = callPackage ./breeze-icons.nix { }; + karchive = callPackage ./karchive.nix { }; + kcalendarcore = callPackage ./kcalendarcore.nix { }; + kcodecs = callPackage ./kcodecs.nix { }; + kconfig = callPackage ./kconfig.nix { }; + kcoreaddons = callPackage ./kcoreaddons.nix { }; + kdbusaddons = callPackage ./kdbusaddons.nix { }; + kdnssd = callPackage ./kdnssd.nix { }; + kguiaddons = callPackage ./kguiaddons.nix { }; + ki18n = callPackage ./ki18n.nix { }; + kidletime = callPackage ./kidletime.nix { }; + kirigami2 = callPackage ./kirigami2.nix { }; + kitemmodels = callPackage ./kitemmodels.nix { }; + kitemviews = callPackage ./kitemviews.nix { }; + kplotting = callPackage ./kplotting.nix { }; + kwayland = callPackage ./kwayland.nix { }; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix { }; + kwindowsystem = callPackage ./kwindowsystem { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet.nix { }; + syntax-highlighting = callPackage ./syntax-highlighting.nix { }; - # TIER 2 - kactivities = callPackage ./kactivities.nix { }; - kauth = callPackage ./kauth { }; - kcompletion = callPackage ./kcompletion.nix { }; - kcontacts = callPackage ./kcontacts.nix { }; - kcrash = callPackage ./kcrash.nix { }; - kdoctools = callPackage ./kdoctools { }; - kfilemetadata = callPackage ./kfilemetadata { }; - kimageformats = callPackage ./kimageformats.nix { }; - kjobwidgets = callPackage ./kjobwidgets.nix { }; - knotifications = callPackage ./knotifications.nix { }; - kpackage = callPackage ./kpackage { }; - kpeople = callPackage ./kpeople.nix { }; - kpty = callPackage ./kpty.nix { }; - kunitconversion = callPackage ./kunitconversion.nix { }; - syndication = callPackage ./syndication.nix { }; + # TIER 2 + kactivities = callPackage ./kactivities.nix { }; + kauth = callPackage ./kauth { }; + kcompletion = callPackage ./kcompletion.nix { }; + kcrash = callPackage ./kcrash.nix { }; + kdoctools = callPackage ./kdoctools { }; + kjobwidgets = callPackage ./kjobwidgets.nix { }; + knotifications = callPackage ./knotifications.nix { }; + kpackage = callPackage ./kpackage { }; + kunitconversion = callPackage ./kunitconversion.nix { }; + syndication = callPackage ./syndication.nix { }; - # TIER 3 - baloo = callPackage ./baloo.nix { }; - kactivities-stats = callPackage ./kactivities-stats.nix { }; - kbookmarks = callPackage ./kbookmarks.nix { }; - kcmutils = callPackage ./kcmutils.nix { }; - kconfigwidgets = callPackage ./kconfigwidgets.nix { }; - kdav = callPackage ./kdav.nix { }; - kdeclarative = callPackage ./kdeclarative.nix { }; - kded = callPackage ./kded.nix { }; - kdesu = callPackage ./kdesu { }; - kemoticons = callPackage ./kemoticons.nix { }; - kglobalaccel = callPackage ./kglobalaccel.nix { }; - kiconthemes = callPackage ./kiconthemes { }; - kinit = callPackage ./kinit { }; - kio = callPackage ./kio { }; - knewstuff = callPackage ./knewstuff { }; - knotifyconfig = callPackage ./knotifyconfig.nix { }; - kparts = callPackage ./kparts.nix { }; - krunner = callPackage ./krunner.nix { }; - kservice = callPackage ./kservice { }; - ktexteditor = callPackage ./ktexteditor.nix { }; - ktextwidgets = callPackage ./ktextwidgets.nix { }; - kwallet = callPackage ./kwallet.nix { }; - kxmlgui = callPackage ./kxmlgui.nix { }; - plasma-framework = callPackage ./plasma-framework.nix { }; - kpurpose = callPackage ./purpose.nix { }; + # TIER 3 + kactivities-stats = callPackage ./kactivities-stats.nix { }; + kbookmarks = callPackage ./kbookmarks.nix { }; + kcmutils = callPackage ./kcmutils.nix { }; + kconfigwidgets = callPackage ./kconfigwidgets.nix { }; + kdeclarative = callPackage ./kdeclarative.nix { }; + kded = callPackage ./kded.nix { }; + kemoticons = callPackage ./kemoticons.nix { }; + kglobalaccel = callPackage ./kglobalaccel.nix { }; + kiconthemes = callPackage ./kiconthemes { }; + kinit = callPackage ./kinit { }; + kio = callPackage ./kio { }; + knewstuff = callPackage ./knewstuff { }; + knotifyconfig = callPackage ./knotifyconfig.nix { }; + kparts = callPackage ./kparts.nix { }; + kservice = callPackage ./kservice { }; + ktextwidgets = callPackage ./ktextwidgets.nix { }; + kwallet = callPackage ./kwallet.nix { }; + kxmlgui = callPackage ./kxmlgui.nix { }; + plasma-framework = callPackage ./plasma-framework.nix { }; - # TIER 4 - frameworkintegration = callPackage ./frameworkintegration.nix { }; + # TIER 4 + frameworkintegration = callPackage ./frameworkintegration.nix { }; - # PORTING AIDS - kdelibs4support = callPackage ./kdelibs4support { }; - kdesignerplugin = callPackage ./kdesignerplugin.nix { }; - khtml = callPackage ./khtml.nix { }; - kjs = callPackage ./kjs.nix { }; - kjsembed = callPackage ./kjsembed.nix { }; - kmediaplayer = callPackage ./kmediaplayer.nix { }; - kross = callPackage ./kross.nix { }; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix { }; - - }; + # PORTING AIDS + kdelibs4support = callPackage ./kdelibs4support { }; + kdesignerplugin = callPackage ./kdesignerplugin.nix { }; + } + // lib.optionalAttrs config.allowAliases { + baloo = mkThrow "baloo"; + bluez-qt = mkThrow "bluez-qt"; + kapidox = mkThrow "kapidox"; + kcontacts = mkThrow "kcontacts"; + kdav = mkThrow "kdav"; + kdesu = mkThrow "kdesu"; + kfilemetadata = mkThrow "kfilemetadata"; + kholidays = mkThrow "kholidays"; + khtml = mkThrow "kthml"; + kimageformats = mkThrow "kimageformats"; + kjs = mkThrow "kjs"; + kjsembed = mkThrow "kjsembed"; + kmediaplayer = mkThrow "kmediaplayer"; + kpeople = mkThrow "kpeople"; + kpty = mkThrow "kpty"; + kpurpose = mkThrow "kpurpose"; + kquickcharts = mkThrow "kquickcharts"; + kross = mkThrow "kross"; + krunner = mkThrow "krunner"; + ktexteditor = mkThrow "ktexteditor"; + kxmlrpcclient = mkThrow "kxmlrpcclient"; + modemmanager-qt = mkThrow "modemmanager-qt"; + networkmanager-qt = mkThrow "networkmanager-qt"; + oxygen-icons = mkThrow "oxygen-icons"; + oxygen-icons5 = mkThrow "oxygen-icons"; + prison = mkThrow "prison"; + qqc2-desktop-style = mkThrow "qqc2-desktop-style"; + threadweaver = mkThrow "threadweaver"; + } + ); in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix deleted file mode 100644 index dda2c55c0daa..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - python3, - qtbase, -}: - -mkDerivation { - pname = "kapidox"; - nativeBuildInputs = [ - python3.pkgs.setuptools - qtbase - ]; - - buildInputs = with python3.pkgs; [ - jinja2 - pyyaml - requests - ]; - - postPatch = '' - sed -i -e 's|"doxy\w\+", ||g' setup.py - ''; - - buildPhase = '' - runHook preBuild - ${python3.interpreter} setup.py build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - ${python3.interpreter} setup.py install --prefix="$out" - runHook postInstall - ''; - - outputs = [ "out" ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix deleted file mode 100644 index 00602918417f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - isocodes, - kcoreaddons, - kconfig, - kcodecs, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kcontacts"; - meta = { - license = [ lib.licenses.lgpl21 ]; - }; - propagatedBuildInputs = [ - isocodes - ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kconfig - kcodecs - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix deleted file mode 100644 index 968063d611c6..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdav.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcoreaddons, - kio, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kdav"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - kio - qtxmlpatterns - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix deleted file mode 100644 index a16f4afe0048..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kcoreaddons, - ki18n, - kpty, - kservice, - qtbase, - useSudo ? false, -}: - -mkDerivation { - pname = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - kpty - kservice - qtbase - ]; - propagatedBuildInputs = [ kpty ]; - outputs = [ - "out" - "dev" - ]; - patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; - cmakeFlags = lib.optionals useSudo [ "-DKDESU_USE_SUDO_DEFAULT=On" ]; - meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch deleted file mode 100644 index 1379707f02fe..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Thu, 16 Jul 2020 13:21:42 -0300 -Subject: [PATCH] Search for the daemon first in /run/wrappers/bin - -If looking first in libexec, the eventually wrapped one in -/run/wrappers/bin can not be found. ---- - src/client.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/client.cpp b/src/client.cpp -index 44fbacd..6b5abf5 100644 ---- a/src/client.cpp -+++ b/src/client.cpp -@@ -384,11 +384,14 @@ int KDEsuClient::stopServer() - - static QString findDaemon() - { -- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); -- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH -- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); -- if (daemon.isEmpty()) { -- qCWarning(KSU_LOG) << "kdesud daemon not found."; -+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); -+ if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); -+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH -+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); -+ if (daemon.isEmpty()) { -+ qCWarning(KSU_LOG) << "kdesud daemon not found."; -+ } - } - } - return daemon; --- -2.27.0 - diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch deleted file mode 100644 index daeaf222b630..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kfilemetadata-5.18.0/src/CMakeLists.txt -=================================================================== ---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt -+++ kfilemetadata-5.18.0/src/CMakeLists.txt -@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K - - install(EXPORT KF5FileMetaDataTargets - NAMESPACE KF5:: -- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData -+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData - FILE KF5FileMetaDataTargets.cmake) - - install(FILES diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix deleted file mode 100644 index 1bdfc378d031..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - extra-cmake-modules, - attr, - ebook_tools, - exiv2, - ffmpeg, - karchive, - kcoreaddons, - ki18n, - poppler, - qtbase, - qtmultimedia, - taglib, -}: - -mkDerivation { - pname = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - attr - ] - ++ [ - ebook_tools - exiv2 - ffmpeg - karchive - kcoreaddons - ki18n - poppler - qtbase - qtmultimedia - taglib - ]; - patches = [ - ./cmake-install-paths.patch - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix deleted file mode 100644 index 2b88650322a0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kholidays.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qtbase, - qtdeclarative, - qttools, -}: - -mkDerivation { - pname = "kholidays"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ bkchr ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtbase - qtdeclarative - qttools - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix deleted file mode 100644 index a513f0f499af..000000000000 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - perl, - giflib, - karchive, - kcodecs, - kglobalaccel, - ki18n, - kiconthemes, - kio, - kjs, - knotifications, - kparts, - ktextwidgets, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - phonon, - qtx11extras, - sonnet, - gperf, -}: - -mkDerivation { - pname = "khtml"; - nativeBuildInputs = [ - extra-cmake-modules - perl - ]; - buildInputs = [ - giflib - karchive - kcodecs - kglobalaccel - ki18n - kiconthemes - kio - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui - phonon - qtx11extras - sonnet - gperf - ]; - propagatedBuildInputs = [ kjs ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix deleted file mode 100644 index bc1b86099939..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - ilmbase, - karchive, - openexr, - libavif, - libheif, - libjxl, - libraw, - qtbase, -}: - -let - inherit (lib) getDev; -in - -mkDerivation { - pname = "kimageformats"; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - openexr - libavif - libheif - libjxl - libraw - qtbase - ]; - outputs = [ "out" ]; # plugins only - cmakeFlags = [ - "-DKIMAGEFORMATS_HEIF=ON" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix deleted file mode 100644 index 681748d86e70..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - qtbase, -}: - -mkDerivation { - pname = "kjs"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtbase - ]; - cmakeFlags = [ - # this can break stuff, see: - # https://invent.kde.org/frameworks/kjs/-/blob/3c663ad8ac16f8982784a5ebd5d9200e7aa07936/CMakeLists.txt#L36-46 - # However: It shouldn't break much considering plasma 5 is planned to be removed. - (lib.cmakeBool "KJS_FORCE_DISABLE_PCRE" true) - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix deleted file mode 100644 index 4b2af13ad7c7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - qttools, - ki18n, - kjs, - qtsvg, -}: - -mkDerivation { - pname = "kjsembed"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - qttools - ]; - buildInputs = [ - ki18n - qtsvg - ]; - propagatedBuildInputs = [ kjs ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix deleted file mode 100644 index 4e2944cc18dd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kparts, - kxmlgui, -}: - -mkDerivation { - pname = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kparts - kxmlgui - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix deleted file mode 100644 index 0402fa8b9187..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - ki18n, - kitemviews, - kservice, - kwidgetsaddons, - qtbase, - qtdeclarative, -}: - -mkDerivation { - pname = "kpeople"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - kitemviews - kservice - kwidgetsaddons - qtdeclarative - ]; - propagatedBuildInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix deleted file mode 100644 index 0815382c9443..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kpty"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix deleted file mode 100644 index 8b54c123308e..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, -}: - -mkDerivation { - pname = "kquickcharts"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtquickcontrols2 ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix deleted file mode 100644 index 970dab3e05c5..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcompletion, - kcoreaddons, - kdoctools, - ki18n, - kiconthemes, - kio, - kparts, - kwidgetsaddons, - kxmlgui, - qtbase, - qtscript, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kross"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kcoreaddons - kxmlgui - ]; - propagatedBuildInputs = [ - ki18n - kiconthemes - kio - kparts - kwidgetsaddons - qtbase - qtscript - qtxmlpatterns - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix deleted file mode 100644 index cd9ee0aa7f5b..000000000000 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - extra-cmake-modules, - perl, - karchive, - kconfig, - kguiaddons, - ki18n, - kiconthemes, - kio, - kparts, - libgit2, - qtscript, - qtxmlpatterns, - sonnet, - syntax-highlighting, - qtquickcontrols, - editorconfig-core-c, -}: - -mkDerivation ( - { - pname = "ktexteditor"; - nativeBuildInputs = [ - extra-cmake-modules - perl - ]; - buildInputs = [ - karchive - kconfig - kguiaddons - ki18n - kiconthemes - kio - libgit2 - qtscript - qtxmlpatterns - sonnet - syntax-highlighting - qtquickcontrols - editorconfig-core-c - ]; - propagatedBuildInputs = [ kparts ]; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - postPatch = '' - substituteInPlace src/part/CMakeLists.txt \ - --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" - ''; - } -) diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix deleted file mode 100644 index eebb1ad24930..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - ki18n, - kio, -}: - -mkDerivation { - pname = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix deleted file mode 100644 index de2cb97e93ee..000000000000 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - modemmanager, - qtbase, -}: - -mkDerivation { - pname = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - modemmanager - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix deleted file mode 100644 index 58b4f4e37a6f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - networkmanager, - qtbase, -}: - -mkDerivation { - pname = "networkmanager-qt"; - - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - networkmanager - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix deleted file mode 100644 index 6e07e1a8dd69..000000000000 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, -}: - -mkDerivation { - pname = "oxygen-icons"; - meta.license = lib.licenses.lgpl3Plus; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - outputs = [ "out" ]; # only runtime outputs -} diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix deleted file mode 100644 index 25488651f605..000000000000 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - libdmtx, - qrencode, - qtbase, - qtmultimedia, - zxing-cpp, -}: - -mkDerivation { - pname = "prison"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libdmtx - qrencode - zxing-cpp - ]; - propagatedBuildInputs = [ - qtbase - qtmultimedia - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix deleted file mode 100644 index 336dfcf414e2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - qtx11extras, - kconfig, - kiconthemes, - kirigami2, -}: - -mkDerivation { - pname = "qqc2-desktop-style"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtx11extras - qtquickcontrols2 - kconfig - kiconthemes - kirigami2 - ]; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 8ec3af5a0414..f216e398f8b0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -33,6 +33,7 @@ makeScopeWithSplicing' { let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { + inherit config; inherit libsForQt5; inherit (pkgs) lib fetchurl; };