diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix index 423fcae1b2b1..56e709f1b91e 100644 --- a/nixos/modules/config/xdg/portals/lxqt.nix +++ b/nixos/modules/config/xdg/portals/lxqt.nix @@ -29,7 +29,6 @@ in [ pkgs.libsForQt5.qtstyleplugin-kvantum pkgs.breeze-qt5 - pkgs.qtcurve ]; ''; description = '' diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 67285acdfedf..fd4d1e409fa3 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -191,8 +191,8 @@ in # Only symlink the KIO plugins, so we don't accidentally pull any services # like KCMs or kcookiejar let - kioPluginPath = "${pkgs.plasma5Packages.qtbase.qtPluginPrefix}/kf5/kio"; - inherit (pkgs.plasma5Packages) kio; + kioPluginPath = "${pkgs.libsForQt5.qtbase.qtPluginPrefix}/kf5/kio"; + inherit (pkgs.libsForQt5.__internalKF5) kio; in pkgs.runCommand "kio5-plugins-only" { } '' mkdir -p $out/${kioPluginPath} diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9c5e90861df6..05336bb03039 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,50 +1,55 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, + cmake, extra-cmake-modules, - kdoctools, wrapQtAppsHook, - qtscript, - kconfig, - kinit, + shared-mime-info, + xz, + qttools, karchive, - kcrash, kcmutils, + kconfig, kconfigwidgets, + kcrash, knewstuff, kparts, - qca-qt5, - shared-mime-info, + qca, }: stdenv.mkDerivation (finalAttrs: { pname = "okteta"; - version = "0.26.25"; + version = "0.26.25-unstable-2026-04-28"; - src = fetchurl { - url = "mirror://kde/stable/okteta/${finalAttrs.version}/src/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-K+GJG/SYyzgDDKXbGtAixQJVfBwLj/asP9rIJUpbt2s="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "okteta"; + rev = "9ab055f50e7569c9a0bc401be4b5686dc1e61dcc"; + hash = "sha256-1ih0kFS7opA5w1QyB7MQAOYFoSAUPKNM8fRi1G/mq2U="; }; nativeBuildInputs = [ - qtscript + cmake extra-cmake-modules - kdoctools wrapQtAppsHook ]; - buildInputs = [ shared-mime-info ]; - propagatedBuildInputs = [ - kconfig - kinit + buildInputs = [ + shared-mime-info + xz + + qttools + + karchive kcmutils + kconfig kconfigwidgets + kcrash knewstuff kparts - qca-qt5 - karchive - kcrash + qca ]; outputs = [ diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 2871514797a0..d2563a0313e4 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, wrapQtAppsHook, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix deleted file mode 100644 index 53b4d511b73f..000000000000 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - extra-cmake-modules, - wrapQtAppsHook, - kiconthemes, - kio, - kjobwidgets, - kxmlgui, - testers, - k4dirstat, -}: - -stdenv.mkDerivation rec { - pname = "k4dirstat"; - version = "3.4.3"; - - src = fetchFromGitHub { - owner = "jeromerobert"; - repo = "k4dirstat"; - rev = version; - hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kiconthemes - kio - kjobwidgets - kxmlgui - ]; - - passthru.tests.version = testers.testVersion { - package = k4dirstat; - command = "k4dirstat -platform offscreen --version &>/dev/stdout"; - }; - - meta = { - homepage = "https://github.com/jeromerobert/k4dirstat"; - description = "Small utility program that sums up disk usage for directory trees"; - mainProgram = "k4dirstat"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.raboof ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix deleted file mode 100644 index 853904523636..000000000000 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - wrapQtAppsHook, - kactivities, - qtbase, -}: - -stdenv.mkDerivation rec { - pname = "KSmoothDock"; - version = "6.3"; - - src = fetchFromGitHub { - owner = "dangvd"; - repo = "ksmoothdock"; - rev = "v${version}"; - sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; - }; - - # Upstream seems dead and there are new deprecation warnings in KF5.100 - # Remember, kids: friends don't let friends build with -Werror - postPatch = '' - substituteInPlace src/CMakeLists.txt --replace "-Werror" "" - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kactivities - qtbase - ]; - - cmakeDir = "../src"; - - meta = { - description = "Cool desktop panel for KDE Plasma 5"; - mainProgram = "ksmoothdock"; - license = lib.licenses.mit; - homepage = "https://dangvd.github.io/ksmoothdock/"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/kup/default.nix b/pkgs/applications/misc/kup/default.nix deleted file mode 100644 index a956b7de416e..000000000000 --- a/pkgs/applications/misc/kup/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - extra-cmake-modules, - shared-mime-info, - wrapQtAppsHook, - kcoreaddons, - kdbusaddons, - ki18n, - kio, - solid, - kidletime, - knotifications, - kconfig, - kinit, - kjobwidgets, - kcmutils, - plasma-framework, - libgit2, -}: - -stdenv.mkDerivation rec { - pname = "kup"; - version = "0.10.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - repo = "kup"; - owner = "system"; - rev = "kup-${version}"; - hash = "sha256-G/GXmcQI1OBnCE7saPHeHDAMeL2WR6nVttMlKV2e01I="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - wrapQtAppsHook - ]; - - buildInputs = [ - kcoreaddons - kdbusaddons - ki18n - kio - solid - kidletime - knotifications - kconfig - kinit - kjobwidgets - plasma-framework - libgit2 - kcmutils - ]; - - meta = { - description = "Backup tool for KDE"; - homepage = "https://apps.kde.org/kup"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.pwoelfel ]; - }; -} diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 1c1f5719f37c..9903c2433c47 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -5,7 +5,6 @@ cmake, qttools, wrapQtAppsHook, - kirigami2, qtquickcontrols2, qtlocation, qtsensors, @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - kirigami2 qtquickcontrols2 qtlocation qtsensors @@ -47,7 +45,7 @@ stdenv.mkDerivation rec { s2geometry ]; - cmakeFlags = [ "-DFLAVOR=kirigami" ]; + cmakeFlags = [ "-DFLAVOR=qtcontrols" ]; pythonPath = with python3.pkgs; [ gpxpy ]; diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index 07d4d5347afd..7ce61dcf307f 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -4,51 +4,63 @@ fetchFromGitHub, installShellFiles, pkg-config, - qmake, + cmake, qtbase, - kcoreaddons, - kwidgetsaddons, qtsvg, wrapQtAppsHook, + qttools, + pugixml, }: - +let + singleApplication = fetchFromGitHub { + owner = "itay-grudev"; + repo = "SingleApplication"; + tag = "v3.2.0"; + hash = "sha256-qjpPYPe1Oism6TetD/dMvTo1qyZKOsOPW+MzzNpJf3A="; + }; +in stdenv.mkDerivation rec { pname = "qelectrotech"; - version = "0.9.0"; + version = "0.100"; src = fetchFromGitHub { owner = "qelectrotech"; repo = "qelectrotech-source-mirror"; - tag = "0.9"; - hash = "sha256-tj8q+mRVtdeDXbpiv4retdbNiIfvAFlutXn7BmjqFYU="; + tag = version; + hash = "sha256-ElkqRiIHSXavXEw1ioFKL1cGnaBb2GXZuxgl98O4WuI="; }; + patches = [ + # stripped down version of https://codeberg.org/gentoo/gentoo/src/branch/master/sci-electronics/qelectrotech/files/qelectrotech-0.90_pre20250820-cmake.patch + ./system-pugixml.patch + ]; + + # fix wrong cmake conditional postPatch = '' - substituteInPlace qelectrotech.pro \ - --replace-fail 'GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""' \ - 'GIT_COMMIT_SHA="\\\"${version}\\\""' \ - --replace-fail "COMPIL_PREFIX = '/usr/local/'" \ - "COMPIL_PREFIX = '$out/'" \ - --replace-fail "INSTALL_PREFIX = '/usr/local/'" \ - "INSTALL_PREFIX = '$out/'" + substituteInPlace cmake/fetch_kdeaddons.cmake \ + --replace-fail "DEFINED BUILD_WITH_KF5" "BUILD_WITH_KF5" ''; + cmakeFlags = [ + "-DBUILD_WITH_KF5=OFF" + # relies on vendored catch2 + "-DPACKAGE_TESTS=OFF" + "-DFETCHCONTENT_SOURCE_DIR_SINGLEAPPLICATION=${singleApplication}" + "-DBUILD_PUGIXML=OFF" + ]; + nativeBuildInputs = [ installShellFiles pkg-config - qmake + cmake wrapQtAppsHook + qttools ]; buildInputs = [ - kcoreaddons - kwidgetsaddons qtbase qtsvg - ]; - - qmakeFlags = [ - "INSTALLROOT=$(out)" + pugixml ]; installPhase = '' diff --git a/pkgs/applications/misc/qelectrotech/system-pugixml.patch b/pkgs/applications/misc/qelectrotech/system-pugixml.patch new file mode 100644 index 000000000000..4b3295abc448 --- /dev/null +++ b/pkgs/applications/misc/qelectrotech/system-pugixml.patch @@ -0,0 +1,57 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,6 @@ + ${QET_DIR}/sources/NameList + ${QET_DIR}/sources/NameList/ui + ${QET_DIR}/sources/utils +- ${QET_DIR}/pugixml/src + ${QET_DIR}/sources/dataBase + ${QET_DIR}/sources/dataBase/ui + ${QET_DIR}/sources/factory/ui +--- a/cmake/qet_compilation_vars.cmake ++++ b/cmake/qet_compilation_vars.cmake +@@ -421,10 +421,6 @@ + ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp + ${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h + +- ${QET_DIR}/pugixml/src/pugiconfig.hpp +- ${QET_DIR}/pugixml/src/pugixml.cpp +- ${QET_DIR}/pugixml/src/pugixml.hpp +- + ${QET_DIR}/sources/qetgraphicsitem/conductor.cpp + ${QET_DIR}/sources/qetgraphicsitem/conductor.h + ${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp +--- a/sources/diagramcontext.h ++++ b/sources/diagramcontext.h +@@ -17,7 +17,7 @@ + */ + #ifndef DIAGRAM_CONTEXT_H + #define DIAGRAM_CONTEXT_H +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + #include +--- a/sources/ElementsCollection/elementslocation.h ++++ b/sources/ElementsCollection/elementslocation.h +@@ -20,7 +20,7 @@ + + #include "../NameList/nameslist.h" + #include "../diagramcontext.h" +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + #include +--- a/sources/NameList/nameslist.h ++++ b/sources/NameList/nameslist.h +@@ -17,7 +17,7 @@ + */ + #ifndef NAMES_LIST_H + #define NAMES_LIST_H +-#include "pugixml/src/pugixml.hpp" ++#include + + #include + /** + diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index eaf712c54871..8e8594c63520 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -2,26 +2,29 @@ fetchurl, lib, stdenv, + cmake, extra-cmake-modules, kdoctools, wrapQtAppsHook, knotifyconfig, kidletime, kwindowsystem, + kstatusnotifieritem, ktextwidgets, kcrash, }: stdenv.mkDerivation rec { pname = "rsibreak"; - version = "0.12.13"; + version = "0.13.0"; src = fetchurl { - url = "mirror://kde/stable/rsibreak/${version}/rsibreak-${version}.tar.xz"; - sha256 = "N0C+f788fq5yotSC54H2K4WDc6PnGi8Nh/vXL4v0fxo="; + url = "mirror://kde/stable/rsibreak/${lib.versions.majorMinor version}/rsibreak-${version}.tar.xz"; + hash = "sha256-arLOCcV9D+UXgwjqlfh9675VrpjPs3QkkireJZO60SA="; }; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools wrapQtAppsHook @@ -30,6 +33,7 @@ stdenv.mkDerivation rec { knotifyconfig kidletime kwindowsystem + kstatusnotifieritem ktextwidgets kcrash ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index bbad5d6cb030..0bc68cd19b3c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -17,6 +17,10 @@ let inherit stdenv; # N/A on Qt5 kimageformats = null; + unwrapped = libsForQt5.callPackage ../telegram-desktop/unwrapped.nix { + inherit stdenv; + kcoreaddons = null; + }; }; version = "1.4.9"; tg_owt = telegram-desktop.tg_owt.overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 46ae3e118578..a716025225ad 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -16,20 +16,9 @@ boost, zlib, qtscript, - phonon, libdbusmenu, qca-qt5, openldap, - - withKDE ? true, # enable KDE integration - extra-cmake-modules, - kconfigwidgets, - kcoreaddons, - knotifications, - knotifyconfig, - ktextwidgets, - kwidgetsaddons, - kxmlgui, }: let @@ -39,7 +28,6 @@ in assert monolithic -> !client && !enableDaemon; assert client || enableDaemon -> !monolithic; -assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [ ("-D" + feature + (if flag then "=ON" else "=OFF")) ]; @@ -76,17 +64,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals buildClient [ libdbusmenu - phonon - ] - ++ lib.optionals (buildClient && withKDE) [ - extra-cmake-modules - kconfigwidgets - kcoreaddons - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui ]; cmakeFlags = [ @@ -97,8 +74,7 @@ stdenv.mkDerivation rec { ++ edf monolithic "WANT_MONO" ++ edf enableDaemon "WANT_CORE" ++ edf enableDaemon "WITH_LDAP" - ++ edf client "WANT_QTCLIENT" - ++ edf withKDE "WITH_KDE"; + ++ edf client "WANT_QTCLIENT"; dontWrapQtApps = true; diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 9e01f7107d78..30a86b541f61 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -1,11 +1,14 @@ { lib, stdenv, - fetchpatch, fetchurl, + fetchpatch, cmake, + pkg-config, extra-cmake-modules, shared-mime-info, + bison, + flex, wrapQtAppsHook, qtbase, @@ -33,7 +36,7 @@ netcdf, cfitsio, libcerf, - # cantor, + cantor, zlib, lz4, readstat, @@ -44,30 +47,33 @@ stdenv.mkDerivation rec { pname = "labplot"; - version = "2.10.1"; + version = "2.12.1"; src = fetchurl { url = "mirror://kde/stable/labplot/labplot-${version}.tar.xz"; - sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8="; + hash = "sha256-4oFVv930DltvfEeRMTVW0eSBOARPIW8hDVFbn21sEGo="; }; - cmakeFlags = [ - # Disable Vector BLF since it depends on DBC parser which fails to be detected - "-DENABLE_VECTOR_BLF=OFF" + patches = [ + # backport build fix + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/education/labplot/-/commit/c2db2ec28aa8958f7041ae5cd03ddae9f44e5aa3.diff"; + hash = "sha256-0biKZXWMs5y1U9phAivEAbd2N4C/CiOKvk/QRAaPimo="; + }) ]; - patches = [ - (fetchpatch { - name = "matio-fix-compilation-for-latest-version-1.5.27.patch"; - url = "https://github.com/KDE/labplot/commit/d6142308ffa492d9f7cea00fad3b4cd1babfd00c.patch"; - hash = "sha256-qD5jj6GxBKbQezKJb1Z8HnwFO84WJBGQDawS/6o/wHE="; - }) + cmakeFlags = [ + "-DQT_FIND_PRIVATE_MODULES=ON" ]; nativeBuildInputs = [ cmake + pkg-config extra-cmake-modules shared-mime-info + bison + flex wrapQtAppsHook ]; @@ -97,7 +103,7 @@ stdenv.mkDerivation rec { netcdf cfitsio libcerf - # cantor + cantor zlib lz4 readstat diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix deleted file mode 100644 index c730a82499a6..000000000000 --- a/pkgs/applications/video/kaffeine/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - cmake, - extra-cmake-modules, - libvlc, - libv4l, - libx11, - kidletime, - kdelibs4support, - libxscrnsaver, - wrapQtAppsHook, - qtx11extras, -}: - -stdenv.mkDerivation rec { - pname = "kaffeine"; - version = "2.0.19"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - repo = "kaffeine"; - owner = "Multimedia"; - rev = "v${version}"; - hash = "sha256-AHyUS2vyeuWFLRXdIoy1sbssDgzz7N957vyf5rWiooI="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - libvlc - libv4l - libx11 - kidletime - qtx11extras - kdelibs4support - libxscrnsaver - ]; - - meta = { - description = "KDE media player"; - homepage = "https://apps.kde.org/kaffeine/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.pasqui23 ]; - platforms = lib.platforms.all; - mainProgram = "kaffeine"; - }; -} diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 84fdbfc86845..bf74970b64f0 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -5,11 +5,8 @@ qmake, qttools, wrapQtAppsHook, - phonon, - phonon-backend-vlc, qtbase, qtdeclarative, - qtx11extras, mpv, # "Free" key generated by pasqui23 @@ -18,21 +15,21 @@ stdenv.mkDerivation rec { pname = "minitube"; - version = "3.9.3"; + version = "4.0"; src = fetchFromGitHub { - hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; - rev = version; repo = "minitube"; owner = "flaviotordini"; + tag = version; fetchSubmodules = true; + hash = "sha256-JAxdPiiPDpmhJBiNtlaMbdcC/YEGJyc9mP3kBvee/74="; }; - patches = [ - # Taken from FreeBSD; already merged upstream in the media submodule - # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) - ./lib_media_src_mpv_mpvwidget.patch - ]; + # https://github.com/NixOS/nixpkgs/issues/214765 + postPatch = '' + substituteInPlace locale/locale.pri \ + --replace-fail '$$[QT_INSTALL_BINS]/lrelease' '${lib.getDev qttools}/bin/lrelease' + ''; nativeBuildInputs = [ qmake @@ -41,11 +38,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - phonon - phonon-backend-vlc qtbase qtdeclarative - qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch deleted file mode 100644 index 9beff68a0ec4..000000000000 --- a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp ---- a/lib/media/src/mpv/mpvwidget.cpp -+++ b/lib/media/src/mpv/mpvwidget.cpp -@@ -30,7 +30,11 @@ - qDebug() << "initializeGL" << nativeParent; - if (nativeParent == nullptr) qFatal("No native parent"); - -- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; -+ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) -+ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; -+ #else -+ mpv_opengl_init_params gl_init_params{get_proc_address, this}; -+ #endif - mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, - {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, - {MPV_RENDER_PARAM_INVALID, nullptr}, diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 7889794a06c1..a47c815aef41 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -10,7 +10,7 @@ cairo, ceres-solver, expat, - extra-cmake-modules, + kdePackages, glog, libxdmcp, python312, @@ -61,7 +61,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index b501927422c4..a9318a0611cd 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -62,7 +62,7 @@ qrcodegencpp, simde, nix-update-script, - extra-cmake-modules, + kdePackages, }: let @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 wrapQtAppsHook - extra-cmake-modules + kdePackages.extra-cmake-modules ] ++ optional scriptingSupport swig ++ optional cudaSupport autoAddDriverRunpath; diff --git a/pkgs/by-name/_8/_86box/package.nix b/pkgs/by-name/_8/_86box/package.nix index 0ab749273e29..d83bb8b0f2c5 100644 --- a/pkgs/by-name/_8/_86box/package.nix +++ b/pkgs/by-name/_8/_86box/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - extra-cmake-modules, + kdePackages, pkg-config, makeWrapper, freetype, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { qt5.wrapQtAppsHook ] ++ lib.optionals enableWayland [ - extra-cmake-modules + kdePackages.extra-cmake-modules wayland-scanner ]; diff --git a/pkgs/by-name/am/amarok/package.nix b/pkgs/by-name/am/amarok/package.nix index 4c38ee22d342..ff187b8d3618 100644 --- a/pkgs/by-name/am/amarok/package.nix +++ b/pkgs/by-name/am/amarok/package.nix @@ -3,7 +3,6 @@ fetchurl, lib, cmake, - extra-cmake-modules, pkg-config, kdePackages, fftw, diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 43b66e34aceb..b678721ec1d3 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -9,7 +9,7 @@ dbus, dbus-test-runner, evolution-data-server, - extra-cmake-modules, + kdePackages, glib, gst_all_1, gtest, @@ -93,11 +93,11 @@ stdenv.mkDerivation (finalAttrs: { if enableLomiriFeatures then ( [ - extra-cmake-modules + kdePackages.extra-cmake-modules mkcal ] ++ (with libsForQt5; [ - kcalendarcore + __internalKF5.kcalendarcore qtbase ]) ++ (with lomiri; [ diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index ba56ce00a1d8..28092a12c1c7 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -6,7 +6,7 @@ cereal, cmake, eigen, - extra-cmake-modules, + kdePackages, fetchFromGitLab, fmt, freeglut, @@ -45,7 +45,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; diff --git a/pkgs/by-name/bc/bcompare4/package.nix b/pkgs/by-name/bc/bcompare4/package.nix deleted file mode 100644 index 90e805ca7d3b..000000000000 --- a/pkgs/by-name/bc/bcompare4/package.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - lib, - autoPatchelfHook, - bzip2, - cairo, - fetchurl, - gdk-pixbuf, - glibc, - pango, - gtk2, - libsForQt5, - stdenv, - runtimeShell, - unzip, -}: - -let - pname = "bcompare4"; - version = "4.4.7.28397"; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb"; - sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U"; - }; - - x86_64-darwin = fetchurl { - url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-qbpM6hJbv+APo+ed45k3GXrl1HnZRxD1uT2lvaN3oM4="; - }; - - aarch64-darwin = srcs.x86_64-darwin; - }; - - src = srcs.${stdenv.hostPlatform.system} or throwSystem; - - linux = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - unpackPhase = '' - ar x $src - tar xfz data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/{bin,lib,share} - - cp -R usr/{bin,lib,share} $out/ - - # Remove library that refuses to be autoPatchelf'ed - rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so - - substituteInPlace $out/bin/bcompare \ - --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ - --replace "ldd" "${glibc.bin}/bin/ldd" \ - --replace "/bin/bash" "${runtimeShell}" - - # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - (lib.getLib stdenv.cc.cc) - gtk2 - pango - cairo - libsForQt5.kio - libsForQt5.kservice - libsForQt5.ki18n - libsForQt5.kcoreaddons - gdk-pixbuf - bzip2 - ]; - - dontBuild = true; - dontConfigure = true; - dontWrapQtApps = true; - - __structuredAttrs = true; - strictDeps = true; - }; - - darwin = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/Applications/BCompare.app - cp -R . $out/Applications/BCompare.app - ''; - - __structuredAttrs = true; - strictDeps = true; - }; - - meta = { - description = "GUI application that allows to quickly and easily compare files and folders"; - longDescription = '' - Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders. - By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. - You can then merge the changes, synchronize your files, and generate reports for your records. - ''; - homepage = "https://www.scootersoftware.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ - ktor - arkivm - ]; - platforms = builtins.attrNames srcs; - mainProgram = "bcompare"; - }; -in -if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/be/beauty-line-icon-theme/package.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix index c92199cd7dc0..b8ba0688b122 100644 --- a/pkgs/by-name/be/beauty-line-icon-theme/package.nix +++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix @@ -8,7 +8,7 @@ mint-x-icons, pantheon, jdupes, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation { @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme mint-x-icons @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation { dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ca/calligraplan/package.nix b/pkgs/by-name/ca/calligraplan/package.nix index 0a6f049da2ad..abb2d290154f 100644 --- a/pkgs/by-name/ca/calligraplan/package.nix +++ b/pkgs/by-name/ca/calligraplan/package.nix @@ -2,53 +2,57 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, - qt5, - libsForQt5, + qt6, + kdePackages, cmake, - extra-cmake-modules, + shared-mime-info, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "calligraplan"; - version = "3.3.0"; + version = "4.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = "calligraplan"; tag = "v${finalAttrs.version}"; - hash = "sha256-szPdRxbzJ2+nmgp+1FwmKZwHEDV8EtbDW/3jsw4J6HI="; + hash = "sha256-OD719omgw+RZrFz6qWiFDFB4t6Lvvh2M2QXYAIh0H2I="; }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/office/calligraplan/-/commit/cdd85c895b487a8b3837bf8b864103997e0af544.patch"; - hash = "sha256-IMoJvvszPuIdWedeU7PQw8ngYmMA7k//wXfT+mZQP88="; - }) - ]; - buildInputs = [ - qt5.qtbase - libsForQt5.kdbusaddons - libsForQt5.kguiaddons - libsForQt5.ki18n - libsForQt5.kiconthemes - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kio - libsForQt5.knotifications - libsForQt5.kparts - libsForQt5.kinit - libsForQt5.kdiagram - libsForQt5.qt5.qtx11extras + qt6.qtbase + kdePackages.karchive + kdePackages.kcalendarcore + kdePackages.kconfig + kdePackages.kconfigwidgets + kdePackages.kcoreaddons + kdePackages.kdbusaddons + kdePackages.kdiagram + kdePackages.kguiaddons + kdePackages.kholidays + kdePackages.ki18n + kdePackages.kiconthemes + kdePackages.kio + kdePackages.kitemmodels + kdePackages.kitemviews + kdePackages.kjobwidgets + kdePackages.knotifications + kdePackages.kparts + kdePackages.ktextwidgets + kdePackages.kwidgetsaddons + kdePackages.kwindowsystem + kdePackages.kxmlgui + kdePackages.plasma-activities + kdePackages.sonnet ]; nativeBuildInputs = [ - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + shared-mime-info ]; passthru = { diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix index a51dce1f9bdb..b4b9c5bed454 100644 --- a/pkgs/by-name/ca/canta-theme/package.nix +++ b/pkgs/by-name/ca/canta-theme/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' patchShebangs . diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 646fda10453c..7acef8fcb848 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -64,9 +64,7 @@ rustPlatform.buildRustPackage { substituteInPlace $cargoDepsCopy/*/sysproxy-*/src/linux.rs \ --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \ - --replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \ --replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \ - --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \ --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"' # this file tries to override the linker used when compiling for certain platforms diff --git a/pkgs/by-name/cr/crow-translate/package.nix b/pkgs/by-name/cr/crow-translate/package.nix index 073d2722bd44..45d7939ad4c5 100644 --- a/pkgs/by-name/cr/crow-translate/package.nix +++ b/pkgs/by-name/cr/crow-translate/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, leptonica, qt6, tesseract, @@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.qttools qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/da/darkly-qt5/package.nix b/pkgs/by-name/da/darkly-qt5/package.nix deleted file mode 100644 index de0113957bd4..000000000000 --- a/pkgs/by-name/da/darkly-qt5/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - darkly, - libsForQt5, -}: -darkly.override { qtPackages = libsForQt5; } diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9a8ddb9f439f..9dad017633cf 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -5,14 +5,11 @@ cmake, ninja, kdePackages, - qtPackages ? kdePackages, + qt6, gitUpdater, }: -let - qtMajorVersion = lib.versions.major qtPackages.qtbase.version; -in stdenv.mkDerivation (finalAttrs: { - pname = "darkly-qt${qtMajorVersion}"; + pname = "darkly"; version = "0.5.32"; src = fetchFromGitHub { @@ -25,34 +22,27 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - qtPackages.wrapQtAppsHook - qtPackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.extra-cmake-modules ]; - buildInputs = - with qtPackages; - [ - qtbase - kconfig - kcoreaddons - kcmutils - kguiaddons - ki18n - kiconthemes - kwindowsystem - ] - ++ lib.optionals (qtMajorVersion == "5") [ - kirigami2 - ] - ++ lib.optionals (qtMajorVersion == "6") [ - kcolorscheme - kdecoration - kirigami - ]; + buildInputs = with kdePackages; [ + qtbase + kconfig + kcoreaddons + kcmutils + kguiaddons + ki18n + kiconthemes + kwindowsystem + kcolorscheme + kdecoration + kirigami + ]; - cmakeFlags = map (v: lib.cmakeBool "BUILD_QT${v}" (v == qtMajorVersion)) [ - "5" - "6" + cmakeFlags = [ + "-DBUILD_QT5=OFF" + "-DBUILD_QT6=ON" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -64,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ pluiedev ]; - } - // lib.optionalAttrs (qtMajorVersion == "6") { mainProgram = "darkly-settings6"; }; }) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index a2ea5ea3dfd2..0f7c3f08fb19 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -7,8 +7,8 @@ gitUpdater, cmake, + pkg-config, ninja, - extra-cmake-modules, flex, bison, wrapGAppsHook3, @@ -81,8 +81,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja - extra-cmake-modules + kdePackages.extra-cmake-modules flex bison kdePackages.wrapQtAppsHook diff --git a/pkgs/by-name/dr/drawpile/package.nix b/pkgs/by-name/dr/drawpile/package.nix index 9a2e905a2dc3..70952f5d1eb6 100644 --- a/pkgs/by-name/dr/drawpile/package.nix +++ b/pkgs/by-name/dr/drawpile/package.nix @@ -3,7 +3,9 @@ lib, fetchFromGitHub, cargo, - extra-cmake-modules, + pkg-config, + cmake, + kdePackages, rustc, rustPlatform, fetchpatch, @@ -91,7 +93,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cargo - extra-cmake-modules + pkg-config + cmake + kdePackages.extra-cmake-modules rustc rustPlatform.cargoSetupHook qt6Packages.wrapQtAppsHook diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix deleted file mode 100644 index 83653b900e40..000000000000 --- a/pkgs/by-name/e-/e-search/package.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - fetchzip, - autoPatchelfHook, - gitMinimal, - gobject-introspection, - makeWrapper, - nodejs_20, - pnpm_10_29_2, - fetchPnpmDeps, - pnpmConfigHook, - electron, - atk, - atkmm, - cairo, - cairomm, - gdk-pixbuf, - glib, - glibmm, - gtk3, - gtkmm3, - harfbuzz, - libsForQt5, - pango, - pangomm, - libxt, - libxtst, - libxrandr, - libx11, - libxcb, - zlib, - nix-update-script, - commandLineArgs ? "", -}: - -let - pnpm' = pnpm_10_29_2.override { nodejs = nodejs_20; }; - eSearch-OCR-ch = fetchzip { - url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip"; - hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4="; - stripRoot = false; - }; - eSearch-OCR-doc_cls = fetchurl { - url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/8.1.0/doc_cls.onnx"; - hash = "sha256-9VFoIq+SYnEeGX/yJKip2IT4BGpjIbdi40+MvwgsRe8="; - }; - eSearch-seg = fetchurl { - url = "https://github.com/xushengfeng/eSearch-seg/releases/download/1.0.0/seg.onnx"; - hash = "sha256-IJSPX4Kg7wIPjdXVmpGbeSk2y98OS+tJrIth9W+J/Q8="; - }; - eSearch-migan_pipeline_v2 = fetchurl { - url = "https://github.com/xushengfeng/eSearch/releases/download/13.1.6/migan_pipeline_v2.onnx"; - hash = "sha256-bx81MKGiMksZdSAYznVgiLB5c82o19iQA0rOXIpIxAs="; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "e-search"; - version = "15.2.3"; - - src = fetchFromGitHub { - owner = "xushengfeng"; - repo = "eSearch"; - tag = finalAttrs.version; - hash = "sha256-wzSspt1qJpBgw4MyiK+vhRjoybNcaaa9nWBPV0bctiM="; - }; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; - nativeBuildInputs = [ gitMinimal ]; - pnpm = pnpm'; - fetcherVersion = 3; - hash = "sha256-gP/0WeVp+Y8QgPmAmbFt+cInX6+4oxPIYlwFpSh2hPQ="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - gobject-introspection - pnpmConfigHook - pnpm' - makeWrapper - nodejs_20 - ]; - - buildInputs = [ - atk - atkmm - cairo - cairomm - gdk-pixbuf - glib - glibmm - gtk3 - gtkmm3 - harfbuzz - (lib.getLib stdenv.cc.cc) - libsForQt5.kauth - libsForQt5.kcodecs - libsForQt5.kcompletion - libsForQt5.kconfigwidgets - libsForQt5.kcoreaddons - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kservice - libsForQt5.kwidgetsaddons - libsForQt5.kio - libsForQt5.qt5.qtbase - libsForQt5.qt5.qtnetworkauth - libsForQt5.qt5.qttools - libsForQt5.qt5.qtxmlpatterns - pango - pangomm - libx11 - libxrandr - libxt - libxtst - libxcb - zlib - ]; - - env = { - ELECTRON_OVERRIDE_DIST_PATH = "${electron}/libexec/electron"; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - }; - - preBuild = '' - mkdir -p assets/onnx/ppocr assets/onnx/seg assets/onnx/inpaint - cp --recursive --no-preserve=mode ${eSearch-OCR-ch}/* assets/onnx/ppocr - cp --no-preserve=mode ${eSearch-OCR-doc_cls} assets/onnx/ppocr/doc_cls.onnx - cp --no-preserve=mode ${eSearch-seg} assets/onnx/seg/seg.onnx - cp --no-preserve=mode ${eSearch-migan_pipeline_v2} assets/onnx/inpaint/migan_pipeline_v2.onnx - ''; - - buildPhase = '' - runHook preBuild - - npm run build - npm exec electron-builder -- \ - --linux \ - --dir \ - -p never \ - --config electron-builder.config.js \ - --config.electronDist=${electron.dist} \ - --config.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/eSearch - ${ - if stdenv.hostPlatform.isAarch64 then - "cp -r build/linux-arm64-unpacked/{resources,LICENSE*} $out/share/eSearch" - else - "cp -r build/linux-unpacked/{resources,LICENSE*} $out/share/eSearch" - } - makeWrapper ${lib.getExe electron} $out/bin/e-search \ - --inherit-argv0 \ - --add-flags $out/share/eSearch/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - for icon_size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do - install -Dm0644 assets/logo/$icon_size.png $out/share/icons/hicolor/$icon_size/apps/e-search.png - done - install -Dm0644 assets/e-search.desktop $out/share/applications/e-search.desktop - - runHook postInstall - ''; - - dontWrapQtApps = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Screenshot OCR search translate search for picture paste the picture on the screen screen recorder"; - homepage = "https://github.com/xushengfeng/eSearch"; - changelog = "https://github.com/xushengfeng/eSearch/releases/tag/${finalAttrs.version}"; - mainProgram = "e-search"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ qzylinra ]; - }; -}) diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index caadde2007af..89a22162a0d5 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rustPlatform, pkg-config, - extra-cmake-modules, + kdePackages, dbus, libx11, libxcb, @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-E3z8NfKZiQsaYqDKXSIltETa4cSL0ShHnUMymjH5pas="; nativeBuildInputs = [ - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config makeWrapper wxwidgets_3_2 diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix deleted file mode 100644 index dd38a9b4cba7..000000000000 --- a/pkgs/by-name/fa/fancontrol-gui/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - cmake, - extra-cmake-modules, - fancontrol-gui, - fetchFromGitHub, - lib, - libgcc, - libsForQt5, - nix-update-script, - stdenv, - testers, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "fancontrol-gui"; - version = "0.8"; - - src = fetchFromGitHub { - owner = "Maldela"; - repo = "fancontrol-gui"; - tag = "v${finalAttrs.version}"; - hash = "sha256-hJaU8SL0b6GmTONGSIzUzzbex6KxHf2Np0bCX8YSSVM="; - }; - - buildInputs = with libsForQt5; [ - libgcc - kcmutils - kdeclarative - kio - plasma-framework - qt5.qtdeclarative - qt5.qtquickcontrols - qt5.qtquickcontrols2 - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - ]; - - patches = [ - ./version.patch - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" - ''; - - passthru = { - tests.version = testers.testVersion { - package = fancontrol-gui; - command = "env QT_QPA_PLATFORM=minimal ${lib.getExe fancontrol-gui} --version"; - }; - updateScript = nix-update-script { }; - }; - - meta = { - description = "GUI for fancontrol with QT and KDE framework 5"; - homepage = "https://github.com/Maldela/fancontrol-gui"; - changelog = "https://github.com/Maldela/fancontrol-gui/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl2Plus; - mainProgram = "fancontrol_gui"; - maintainers = with lib.maintainers; [ dashietm ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/fa/fancontrol-gui/version.patch b/pkgs/by-name/fa/fancontrol-gui/version.patch deleted file mode 100644 index 9b0ea0943b8f..000000000000 --- a/pkgs/by-name/fa/fancontrol-gui/version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fancontrol-gui/src/main.cpp b/fancontrol-gui/src/main.cpp -index 9f33fa0..ae0deb6 100644 ---- a/fancontrol-gui/src/main.cpp -+++ b/fancontrol-gui/src/main.cpp -@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) - - auto about = KAboutData(QStringLiteral("org.kde.fancontrol.gui"), - i18n("Fancontrol-GUI"), -- QStringLiteral("0.7"), -+ QStringLiteral("0.8"), - i18n("Graphical user interface for fancontrol"), - KAboutLicense::KAboutLicense::GPL_V2, - QStringLiteral("Copyright (C) 2015 Malte Veerman"), diff --git a/pkgs/by-name/fc/fcitx5-anthy/package.nix b/pkgs/by-name/fc/fcitx5-anthy/package.nix index dbf8ad0a078f..afb6c4af67d4 100644 --- a/pkgs/by-name/fc/fcitx5-anthy/package.nix +++ b/pkgs/by-name/fc/fcitx5-anthy/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - extra-cmake-modules, + kdePackages, pkg-config, fcitx5, anthy, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext # msgfmt pkg-config zstd diff --git a/pkgs/by-name/fc/fcitx5-array/package.nix b/pkgs/by-name/fc/fcitx5-array/package.nix index d3993d83e984..12de32a108f1 100644 --- a/pkgs/by-name/fc/fcitx5-array/package.nix +++ b/pkgs/by-name/fc/fcitx5-array/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fmt, cmake, - extra-cmake-modules, + kdePackages, gettext, fcitx5, sqlite, @@ -23,11 +23,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules fmt fcitx5 sqlite diff --git a/pkgs/by-name/fc/fcitx5-bamboo/package.nix b/pkgs/by-name/fc/fcitx5-bamboo/package.nix index 2b75181a719b..aa3a35d40c8f 100644 --- a/pkgs/by-name/fc/fcitx5-bamboo/package.nix +++ b/pkgs/by-name/fc/fcitx5-bamboo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, fcitx5, gettext, go, @@ -25,12 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext go ]; buildInputs = [ + kdePackages.extra-cmake-modules fcitx5 ]; diff --git a/pkgs/by-name/fc/fcitx5-chewing/package.nix b/pkgs/by-name/fc/fcitx5-chewing/package.nix index 74df970f72b6..f1f53547f01e 100644 --- a/pkgs/by-name/fc/fcitx5-chewing/package.nix +++ b/pkgs/by-name/fc/fcitx5-chewing/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, fcitx5, libchewing, @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-gtk/package.nix b/pkgs/by-name/fc/fcitx5-gtk/package.nix index 57a44919d525..767d6e85bf7a 100644 --- a/pkgs/by-name/fc/fcitx5-gtk/package.nix +++ b/pkgs/by-name/fc/fcitx5-gtk/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, gobject-introspection, glib, @@ -71,7 +72,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gobject-introspection ]; diff --git a/pkgs/by-name/fc/fcitx5-hangul/package.nix b/pkgs/by-name/fc/fcitx5-hangul/package.nix index 72b8dd1eed4a..47dcd7b3e634 100644 --- a/pkgs/by-name/fc/fcitx5-hangul/package.nix +++ b/pkgs/by-name/fc/fcitx5-hangul/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, fcitx5, libhangul, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-m17n/package.nix b/pkgs/by-name/fc/fcitx5-m17n/package.nix index b17bbdc80414..576ca57ebcd7 100644 --- a/pkgs/by-name/fc/fcitx5-m17n/package.nix +++ b/pkgs/by-name/fc/fcitx5-m17n/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, fcitx5, m17n_lib, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config gettext ]; diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 1c713b159a6c..ad38ec542fd6 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, json_c, icu, @@ -26,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules fcitx5 fmt gtest diff --git a/pkgs/by-name/fc/fcitx5-rime/package.nix b/pkgs/by-name/fc/fcitx5-rime/package.nix index 3ab643daf337..9083c8873d56 100644 --- a/pkgs/by-name/fc/fcitx5-rime/package.nix +++ b/pkgs/by-name/fc/fcitx5-rime/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, cmake, - extra-cmake-modules, + kdePackages, gettext, zstd, fcitx5, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config gettext zstd diff --git a/pkgs/by-name/fc/fcitx5-table-extra/package.nix b/pkgs/by-name/fc/fcitx5-table-extra/package.nix index 60b2d8e70db8..6059b4546e21 100644 --- a/pkgs/by-name/fc/fcitx5-table-extra/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-extra/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, gettext, libime, boost, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext libime fcitx5 diff --git a/pkgs/by-name/fc/fcitx5-table-other/package.nix b/pkgs/by-name/fc/fcitx5-table-other/package.nix index f62e1611bcbb..113a18ae2ede 100644 --- a/pkgs/by-name/fc/fcitx5-table-other/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-other/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, gettext, libime, boost, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext libime fcitx5 diff --git a/pkgs/by-name/fc/fcitx5/package.nix b/pkgs/by-name/fc/fcitx5/package.nix index 42123c74edcc..6ac5d9b7b750 100644 --- a/pkgs/by-name/fc/fcitx5/package.nix +++ b/pkgs/by-name/fc/fcitx5/package.nix @@ -6,7 +6,7 @@ pkg-config, buildPackages, cmake, - extra-cmake-modules, + kdePackages, wayland-scanner, cairo, pango, @@ -61,13 +61,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wayland-scanner gettext ]; buildInputs = [ + kdePackages.extra-cmake-modules expat isocodes cairo diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index 18f55e5cbda9..eb89a4959e9f 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -6,7 +6,7 @@ pantheon, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontFixup = true; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/share/icons diff --git a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix index 1095643dbd14..2dc7bfc5e29c 100644 --- a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix +++ b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix @@ -5,7 +5,7 @@ gtk3, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; dontDropIconThemeCache = true; + dontWrapQtApps = true; meta = { description = "Gruvbox icons for GTK based desktop environments"; diff --git a/pkgs/by-name/ic/icemon/package.nix b/pkgs/by-name/ic/icemon/package.nix index 41d872b6c3a0..880f8d13da86 100644 --- a/pkgs/by-name/ic/icemon/package.nix +++ b/pkgs/by-name/ic/icemon/package.nix @@ -4,7 +4,8 @@ asciidoc, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, + pkg-config, icecream, libcap_ng, lzo, @@ -27,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ asciidoc cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + pkg-config qt6.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index 8ad0511bf4c1..ce60330b31a0 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -7,7 +7,6 @@ # build cmake, - extra-cmake-modules, kdePackages, pkg-config, writableTmpDirAsHomeHook, @@ -37,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.wrapQtAppsHook pkg-config writableTmpDirAsHomeHook diff --git a/pkgs/by-name/kd/kdesvn/package.nix b/pkgs/by-name/kd/kdesvn/package.nix deleted file mode 100644 index eba7462c7c7a..000000000000 --- a/pkgs/by-name/kd/kdesvn/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - cmake, - qt5, - apr, - aprutil, - subversion, - subversionClient, - libsForQt5, - extra-cmake-modules, -}: - -stdenv.mkDerivation { - pname = "kdesvn"; - version = "2.1"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "sdk"; - repo = "kdesvn"; - rev = "2028bc2f3621510db05e437e33f5cc225a7cd16b"; - hash = "sha256-IaERXT648v2nTW89V6gpf7Dt95GJd92QmC50de+Knq8="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)" - ''; - - cmakeFlags = [ - "-DSUBVERSION_INSTALL_PATH=${lib.getDev subversion}" - ]; - - nativeBuildInputs = [ - cmake - qt5.wrapQtAppsHook - apr.dev - aprutil.dev - extra-cmake-modules - ]; - - buildInputs = [ - qt5.qtbase - subversion - subversionClient - libsForQt5.kbookmarks - libsForQt5.kcodecs - libsForQt5.kcompletion - libsForQt5.kconfig - libsForQt5.kconfigwidgets - libsForQt5.kcoreaddons - libsForQt5.kdbusaddons - libsForQt5.kdoctools - libsForQt5.ki18n - libsForQt5.kiconthemes - libsForQt5.kitemviews - libsForQt5.kjobwidgets - libsForQt5.kio - libsForQt5.knotifications - libsForQt5.kparts - libsForQt5.kservice - libsForQt5.ktextwidgets - libsForQt5.kwallet - libsForQt5.kwidgetsaddons - libsForQt5.kxmlgui - ]; - - meta = { - homepage = "https://invent.kde.org/sdk/kdesvn"; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - mainProgram = "kdesvn"; - description = "Subversion client by KDE"; - license = lib.licenses.agpl3Plus; - }; -} diff --git a/pkgs/by-name/kd/kdiff3/package.nix b/pkgs/by-name/kd/kdiff3/package.nix index 460dd66312c6..e3000e2143b6 100644 --- a/pkgs/by-name/kd/kdiff3/package.nix +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchurl, - extra-cmake-modules, boost, + cmake, kdePackages, }: @@ -17,7 +17,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - extra-cmake-modules + cmake + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch deleted file mode 100644 index 19ca4a46ec88..000000000000 --- a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03dfe43..33553f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.10) - cmake_policy(SET CMP0048 NEW) - project(kgraphviewer VERSION "2.4.3") - set(KGRAPHVIEWERLIB_SOVERION 3) diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix deleted file mode 100644 index 3247296c1608..000000000000 --- a/pkgs/by-name/kg/kgraphviewer/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - extra-cmake-modules, - pkg-config, - wrapGAppsHook3, - libsForQt5, - boost, - graphviz, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kgraphviewer"; - version = "2.4.3"; - - src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${finalAttrs.version}/kgraphviewer-${finalAttrs.version}.tar.xz"; - sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; - }; - - patches = [ ./cmake-minimum-required.patch ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtsvg - boost - graphviz - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - wrapGAppsHook3 - libsForQt5.kdoctools - libsForQt5.wrapQtAppsHook - ]; - - propagatedBuildInputs = with libsForQt5; [ - kconfig - kinit - kio - kparts - kwidgetsaddons - ]; - - meta = { - description = "Graphviz dot graph viewer for KDE"; - mainProgram = "kgraphviewer"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index c97167e898fb..2ced131f418d 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -7,7 +7,7 @@ fetchFromGitHub, pkg-config, cmake, - extra-cmake-modules, + kdePackages, withWayland ? true, withIndicator ? true, dbus, @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - extra-cmake-modules + kdePackages.extra-cmake-modules rustPlatform.bindgenHook rustPlatform.cargoSetupHook rustc diff --git a/pkgs/by-name/ki/kio-fuse/package.nix b/pkgs/by-name/ki/kio-fuse/package.nix deleted file mode 100644 index 8c6d0863fea2..000000000000 --- a/pkgs/by-name/ki/kio-fuse/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - cmake, - extra-cmake-modules, - libsForQt5, - fuse3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kio-fuse"; - version = "5.1.0"; - - src = fetchgit { - url = "https://invent.kde.org/system/kio-fuse.git"; - hash = "sha256-xVeDNkSeHCk86L07lPVokSgHNkye2tnLoCkdw4g2Jv0="; - rev = "v${finalAttrs.version}"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.kio - fuse3 - ]; - - meta = { - description = "FUSE Interface for KIO"; - homepage = "https://invent.kde.org/system/kio-fuse"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ _1000teslas ]; - }; -}) diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix index 1a150bc46352..80075abbc1eb 100644 --- a/pkgs/by-name/kp/kphotoalbum/package.nix +++ b/pkgs/by-name/kp/kphotoalbum/package.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, lib, - extra-cmake-modules, exiv2, ffmpeg, libvlc, @@ -27,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kr/krename/package.nix b/pkgs/by-name/kr/krename/package.nix index 50add1b75286..92cc85ddf0f1 100644 --- a/pkgs/by-name/kr/krename/package.nix +++ b/pkgs/by-name/kr/krename/package.nix @@ -2,7 +2,7 @@ stdenv, fetchFromGitLab, lib, - extra-cmake-modules, + cmake, kdePackages, taglib, exiv2, @@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - extra-cmake-modules + cmake + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kr/krusader/package.nix b/pkgs/by-name/kr/krusader/package.nix index f4e98cb2cffe..2753a4696998 100644 --- a/pkgs/by-name/kr/krusader/package.nix +++ b/pkgs/by-name/kr/krusader/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - extra-cmake-modules, cmake, kdePackages, }: @@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules kdePackages.kdoctools kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ks/ksnip/package.nix b/pkgs/by-name/ks/ksnip/package.nix index a06b8e76337f..462b646d1e96 100644 --- a/pkgs/by-name/ks/ksnip/package.nix +++ b/pkgs/by-name/ks/ksnip/package.nix @@ -3,43 +3,37 @@ lib, cmake, fetchFromGitHub, - fetchpatch, - libsForQt5, + qt6, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "ksnip"; - version = "1.10.1"; + version = "1.10.1-unstable-2026-02-27"; src = fetchFromGitHub { owner = "ksnip"; repo = "ksnip"; - tag = "v${finalAttrs.version}"; - hash = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I="; + rev = "f50e2764d0d51af2fd06c9d70f1e5f1631726975"; + hash = "sha256-XehTMbvSRHfwTy6+Rv2QavQfRs6lK1+sd04iOZZZH4c="; }; - patches = [ - # Fix build with latest kImageAnnotator - (fetchpatch { - url = "https://github.com/ksnip/ksnip/commit/76f4b381971eead6ff31b8bf3bb64bb5717469c3.patch"; - hash = "sha256-JWoI974qDNZIzr/8oksI8m6g3XNWEaQRGsqSfvQrmao="; - }) + cmakeFlags = [ + "-DBUILD_WITH_QT6=ON" + "-DQT_FIND_PRIVATE_MODULES=ON" ]; nativeBuildInputs = [ cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - qttools - ]); + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + qt6.qttools + ]; - buildInputs = with libsForQt5; [ - kcolorpicker - kimageannotator - qtsvg - qtx11extras + buildInputs = [ + kdePackages.kcolorpicker + kdePackages.kimageannotator + qt6.qtsvg ]; meta = { diff --git a/pkgs/by-name/kt/ktextaddons/package.nix b/pkgs/by-name/kt/ktextaddons/package.nix deleted file mode 100644 index 0e0d32871452..000000000000 --- a/pkgs/by-name/kt/ktextaddons/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - libsForQt5, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "ktextaddons"; - version = "1.3.2"; - - src = fetchurl { - url = "mirror://kde/stable/ktextaddons/ktextaddons-${finalAttrs.version}.tar.xz"; - hash = "sha256-mB7Hh2Ljrg8D2GxDyHCa1s6CVmg5DDkhwafEqtSqUeM="; - }; - - nativeBuildInputs = [ - cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - ]); - - buildInputs = with libsForQt5; [ - karchive - kconfigwidgets - kcoreaddons - ki18n - kxmlgui - qtkeychain - ]; - - meta = { - description = "Various text handling addons for KDE applications"; - homepage = "https://invent.kde.org/libraries/ktextaddons/"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix index e3dd010f7098..c8cc7dba86ca 100644 --- a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix +++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix @@ -5,7 +5,7 @@ gnome-icon-theme, hicolor-icon-theme, pantheon, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -20,13 +20,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; postPatch = '' patchShebangs configure diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix index 2b59381bfbfc..8dee87e0b676 100644 --- a/pkgs/by-name/li/libime/package.nix +++ b/pkgs/by-name/li/libime/package.nix @@ -4,7 +4,8 @@ fetchurl, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, boost, python3, fcitx5, @@ -48,7 +49,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules python3 ]; diff --git a/pkgs/by-name/li/licensedigger/package.nix b/pkgs/by-name/li/licensedigger/package.nix index 9035c07c27d4..296cf780454a 100644 --- a/pkgs/by-name/li/licensedigger/package.nix +++ b/pkgs/by-name/li/licensedigger/package.nix @@ -3,32 +3,31 @@ fetchFromGitLab, stdenv, cmake, - extra-cmake-modules, - libsForQt5, + kdePackages, + qt6, }: stdenv.mkDerivation { pname = "licensedigger"; - version = "0-unstable-2024-08-28"; + version = "0-unstable-2025-08-19"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "SDK"; repo = "licensedigger"; - rev = "cc4b24d3fb67afa8fb0a9ef61210588958eaf0f5"; - hash = "sha256-/ZEja+iDx0lVkJaLshPd1tZD4ZUspVeFHY1TNXjr4qg="; + rev = "711236617bfdeb4f72fecec3ab29bc25806337e5"; + hash = "sha256-IuH7K2Hhhdzw01fypiabv8/tClt+0rr4j94JAy8VKN4="; }; nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase + qt6.qtbase ]; - dontWrapQtApps = true; - meta = { description = "Tools to convert existing license headers to SPDX compliant headers"; homepage = "https://invent.kde.org/sdk/licensedigger"; diff --git a/pkgs/by-name/ma/maia-icon-theme/package.nix b/pkgs/by-name/ma/maia-icon-theme/package.nix deleted file mode 100644 index 818a8cf9f167..000000000000 --- a/pkgs/by-name/ma/maia-icon-theme/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - cmake, - extra-cmake-modules, - gtk3, - hicolor-icon-theme, - libsForQt5, -}: - -stdenv.mkDerivation { - pname = "maia-icon-theme"; - version = "2018-02-24"; - - src = fetchFromGitLab { - domain = "gitlab.manjaro.org"; - group = "artwork"; - owner = "themes"; - repo = "maia"; - rev = "b61312cc80cb9d12b0d8a55b3e61668eb6b77d2d"; - sha256 = "1g98snlh96z4sqw9sfd7fxgamh45pcj3lh1kcmng7mirvrcn2pam"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - gtk3 - libsForQt5.plasma-framework - libsForQt5.kwindowsystem - ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace {icons,icons-dark}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - ''; - - postInstall = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = { - description = "Icons based on Breeze and Super Flat Remix"; - homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index 97450c5b3626..36a715ebc1b2 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -3,7 +3,7 @@ SDL2, cmake, enet, - extra-cmake-modules, + kdePackages, fetchFromGitHub, faad2, libGL, @@ -40,12 +40,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wrapQtAppsHook ]; buildInputs = [ + kdePackages.extra-cmake-modules SDL2 enet faad2 diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix index ab3b493241f5..a87dd92bf812 100644 --- a/pkgs/by-name/mk/mkcal/package.nix +++ b/pkgs/by-name/mk/mkcal/package.nix @@ -6,7 +6,7 @@ testers, cmake, doxygen, - extra-cmake-modules, + kdePackages, graphviz, libsForQt5, perl, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules doxygen graphviz perl @@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { ]); buildInputs = with libsForQt5; [ - kcalendarcore + kdePackages.extra-cmake-modules + __internalKF5.kcalendarcore qtbase qtpim timed diff --git a/pkgs/by-name/mu/muse/package.nix b/pkgs/by-name/mu/muse/package.nix index 18b3bb23c90e..fa002cccd2dd 100644 --- a/pkgs/by-name/mu/muse/package.nix +++ b/pkgs/by-name/mu/muse/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, alsa-lib, dssi, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config libsForQt5.qttools libsForQt5.wrapQtAppsHook diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 20f9e121a909..832dc179d7fe 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -5,7 +5,6 @@ qt6Packages, stdenv, cmake, - extra-cmake-modules, inotify-tools, kdePackages, libcloudproviders, @@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - extra-cmake-modules + kdePackages.extra-cmake-modules librsvg sphinx qt6Packages.wrapQtAppsHook diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix index 157065023948..63783b327735 100644 --- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 70f459769eff..1c09f1898995 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme/package.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix index 8438f544d88d..8a47d2c4bd56 100644 --- a/pkgs/by-name/nu/numix-icon-theme/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, hicolor-icon-theme, gitUpdater, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -27,12 +27,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix index 754011079651..d9cb3826e789 100644 --- a/pkgs/by-name/on/one-click-backup/package.nix +++ b/pkgs/by-name/on/one-click-backup/package.nix @@ -5,7 +5,7 @@ cmake, ninja, qt6, - extra-cmake-modules, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ninja qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix index fb396745f57d..5be293cff3e4 100644 --- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix +++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - plasma5Packages, + kdePackages, hicolor-icon-theme, }: @@ -23,11 +23,12 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - plasma5Packages.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/os/osmscout-server/package.nix b/pkgs/by-name/os/osmscout-server/package.nix index c35fde3b12b1..1d25bed26056 100644 --- a/pkgs/by-name/os/osmscout-server/package.nix +++ b/pkgs/by-name/os/osmscout-server/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libsForQt5.kirigami2 libsForQt5.qtquickcontrols2 libsForQt5.qtlocation valhalla @@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ]; qmakeFlags = [ - "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant + "SCOUT_FLAVOR=qtcontrols" "CONFIG+=disable_mapnik" # Disable the optional mapnik backend ]; diff --git a/pkgs/by-name/pa/pa-notify/package.nix b/pkgs/by-name/pa/pa-notify/package.nix index 1ec4996f8bfd..c996fd76530c 100644 --- a/pkgs/by-name/pa/pa-notify/package.nix +++ b/pkgs/by-name/pa/pa-notify/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, glib, libnotify, libpulseaudio, @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; diff --git a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix index 09d47a182a21..dfe02f4359f5 100644 --- a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix +++ b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme papirus-icon-theme hicolor-icon-theme diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 974703db4286..df8f52c95f5d 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -5,7 +5,7 @@ cmake, cubeb, curl, - extra-cmake-modules, + kdePackages, ffmpeg, gtk3, libxrandr, @@ -75,7 +75,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config strip-nondeterminism wrapGAppsHook3 @@ -84,6 +84,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + kdePackages.extra-cmake-modules curl ffmpeg gtk3 diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 1d2b4e70e8d2..b9565e076212 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - extra-cmake-modules, + kdePackages, exiv2, graphicsmagick, libarchive, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.qttools qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/pi/pipecontrol/package.nix b/pkgs/by-name/pi/pipecontrol/package.nix deleted file mode 100644 index 7dbdf94f9fd3..000000000000 --- a/pkgs/by-name/pi/pipecontrol/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pipewire, - cmake, - extra-cmake-modules, - libsForQt5, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pipecontrol"; - version = "0.2.12"; - - src = fetchFromGitHub { - owner = "portaloffreedom"; - repo = "pipecontrol"; - tag = "v${finalAttrs.version}"; - hash = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - ]; - - buildInputs = [ - pipewire - ] - ++ (with libsForQt5; [ - qtbase - kirigami2 - kcoreaddons - ki18n - qtquickcontrols2 - ]); - - meta = { - description = "Pipewire control GUI program in Qt (Kirigami2)"; - mainProgram = "pipecontrol"; - homepage = "https://github.com/portaloffreedom/pipecontrol"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ tilcreator ]; - }; -}) diff --git a/pkgs/by-name/pl/playbar2/package.nix b/pkgs/by-name/pl/playbar2/package.nix deleted file mode 100644 index c878dd67a748..000000000000 --- a/pkgs/by-name/pl/playbar2/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - cmake, - libsForQt5, - fetchFromGitHub, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "playbar2"; - version = "2.5"; - - src = fetchFromGitHub { - owner = "jsmitar"; - repo = "PlayBar2"; - tag = "v${finalAttrs.version}"; - hash = "sha256-kC04yyt0vCsie8HGJySSiDNzkWKAGncmyOKrRx2pYkc="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.extra-cmake-modules - ]; - - buildInputs = [ - libsForQt5.plasma-framework - libsForQt5.kwindowsystem - ]; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - description = "Mpris2 Client for Plasma5"; - homepage = "https://github.com/jsmitar/PlayBar2"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pjones ]; - }; -}) diff --git a/pkgs/by-name/po/polonium/package.nix b/pkgs/by-name/po/polonium/package.nix deleted file mode 100644 index 3b817fa47fca..000000000000 --- a/pkgs/by-name/po/polonium/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildNpmPackage, - libsForQt5, -}: - -# how to update: -# 1. check out the tag for the version in question -# 2. run `prefetch-npm-deps package-lock.json` -# 3. update npmDepsHash with the output of the previous step - -buildNpmPackage rec { - pname = "polonium"; - version = "1.0rc"; - - src = fetchFromGitHub { - owner = "zeroxoneafour"; - repo = "polonium"; - rev = "v" + version; - hash = "sha256-AdMeIUI7ZdctpG/kblGdk1DBy31nDyolPVcTvLEHnNs="; - }; - - npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; - - dontConfigure = true; - - # the installer does a bunch of stuff that fails in our sandbox, so just build here and then we - # manually do the install - buildFlags = [ - "res" - "src" - ]; - - nativeBuildInputs = with libsForQt5; [ plasma-framework ]; - - dontNpmBuild = true; - - dontWrapQtApps = true; - - installPhase = '' - runHook preInstall - - plasmapkg2 --install pkg --packageroot $out/share/kwin/scripts - - runHook postInstall - ''; - - meta = { - description = "Auto-tiler that uses KWin 6.0+ tiling functionality"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - peterhoeg - kotatsuyaki - HeitorAugustoLN - ]; - inherit (libsForQt5.plasma-framework.meta) platforms; - }; -} diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index a167d85ead6a..eba8d5e42f61 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -2,7 +2,6 @@ lib, cmake, exiv2, - extra-cmake-modules, fetchFromGitLab, imagemagick, libarchive, @@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config qt6Packages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 5fa0fb32bf3a..b1c6e194d927 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -3,8 +3,8 @@ stdenv, fetchFromGitHub, cmake, + pkg-config, cmark, - extra-cmake-modules, gamemode, jdk17, kdePackages, @@ -44,8 +44,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ninja - extra-cmake-modules + kdePackages.extra-cmake-modules jdk17 stripJavaArchivesHook ]; diff --git a/pkgs/by-name/qs/qstopmotion/package.nix b/pkgs/by-name/qs/qstopmotion/package.nix index c127d0814be4..7a4cf0fc8c03 100644 --- a/pkgs/by-name/qs/qstopmotion/package.nix +++ b/pkgs/by-name/qs/qstopmotion/package.nix @@ -5,7 +5,7 @@ # nativeBuildInputs cmake, - extra-cmake-modules, + kdePackages, gettext, gphoto2, libgphoto2, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext gphoto2 libgphoto2 diff --git a/pkgs/by-name/qt/qtengine/package.nix b/pkgs/by-name/qt/qtengine/package.nix index 70ee18462c95..eff435bf7ada 100644 --- a/pkgs/by-name/qt/qtengine/package.nix +++ b/pkgs/by-name/qt/qtengine/package.nix @@ -4,7 +4,6 @@ cmake, ninja, kdePackages, - libsForQt5, fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { @@ -18,11 +17,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aJ5ZdIX10nmhzMLjP6QMuFJHvljJD+xcojuKZjPkr70="; }; - outputs = [ - "out" - "qt5" - ]; - nativeBuildInputs = [ cmake ninja @@ -35,34 +29,9 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.kiconthemes ]; - # Workaround for Qt5/Qt6 dual support, similar to breeze (pkgs/kde/plasma/breeze) cmakeFlags = [ "-DQT6_PLUGINDIR=${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}" - "-DQT5_PLUGINDIR=${placeholder "qt5"}/${libsForQt5.qtbase.qtPluginPrefix}" - "-DQT5_LIBDIR=${placeholder "qt5"}/lib" - "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" - "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" - "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" - "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" - "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" - "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DQt5ThemeSupport_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5ThemeSupport" - "-DQt5ThemeSupport_LIBRARY=${libsForQt5.qtbase.out}/lib/libQt5ThemeSupport.a" - "-DQt5ThemeSupport_INCLUDE_DIR=${libsForQt5.qtbase.dev}/include/QtThemeSupport/${libsForQt5.qtbase.version}" - "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" - "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" - "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" - "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" - "-DQt5QuickControls2_DIR=${libsForQt5.qtquickcontrols2.dev}/lib/cmake/Qt5QuickControls2" - - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DBUILD_QT5=OFF" ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix index d1701d6666d0..7768bafc85a4 100644 --- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix +++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, unstableGitUpdater, cmake, - extra-cmake-modules, + kdePackages, libsForQt5, mkcal, pkg-config, @@ -31,15 +31,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config ]; buildInputs = [ + kdePackages.extra-cmake-modules mkcal ] ++ (with libsForQt5; [ - kcalendarcore + __internalKF5.kcalendarcore qtbase qtpim ]); diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index 6d0d52b413f0..ef7cfcf649c8 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -60,6 +60,7 @@ lib.checkListOfEnum "${pname}: color variants" # Package may install many small files. dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; # FIXME: https://github.com/yeyushengfan258/Reversal-icon-theme/issues/108 dontCheckForBrokenSymlinks = true; diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix index 247989343f6e..007c498ad761 100644 --- a/pkgs/by-name/ru/ruqola/package.nix +++ b/pkgs/by-name/ru/ruqola/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitLab, cmake, - extra-cmake-modules, kdePackages, qt6, nix-update-script, @@ -23,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/sf/sfxr-qt/package.nix b/pkgs/by-name/sf/sfxr-qt/package.nix index 3395549600e2..f98e984f2bb2 100644 --- a/pkgs/by-name/sf/sfxr-qt/package.nix +++ b/pkgs/by-name/sf/sfxr-qt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + kdePackages, libsForQt5, cmake, SDL, @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - libsForQt5.extra-cmake-modules + kdePackages.extra-cmake-modules (python3.withPackages ( pp: with pp; [ pyyaml diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix index e725df5c9e34..91c8ca2e58c0 100644 --- a/pkgs/by-name/su/subtitlecomposer/package.nix +++ b/pkgs/by-name/su/subtitlecomposer/package.nix @@ -2,11 +2,12 @@ lib, fetchFromGitLab, cmake, - extra-cmake-modules, - ffmpeg_6, + pkg-config, + ffmpeg_7, openal, stdenv, - libsForQt5, + qt6, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -21,16 +22,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zGbI960NerlOEUvhOLm+lEJdbhj8VFUfm8pkOYGRcGw="; }; + cmakeFlags = [ + "-DQT_MAJOR_VERSION=6" + "-DQT_FIND_PRIVATE_MODULES=ON" + ]; + nativeBuildInputs = [ cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook ]; buildInputs = [ - ffmpeg_6 + ffmpeg_7 openal + qt6.qt5compat ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ kcodecs kconfig kconfigwidgets diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 83d35290e482..8a5b9f20fe61 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, davfs2, cmake, - extra-cmake-modules, stdenv, pkg-config, kdePackages, diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index 79e5e9bfe70c..32e86eb997c9 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, adwaita-icon-theme, - libsForQt5, + kdePackages, gtk3, hicolor-icon-theme, jdupes, @@ -52,11 +52,12 @@ lib.checkListOfEnum "tela-circle-icon-theme: color variants" propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary for this package. # Package may install almost 400 000 small files. diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index 7af830eb456b..5d9d9ed04f69 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -5,7 +5,7 @@ gtk3, jdupes, adwaita-icon-theme, - libsForQt5, + kdePackages, hicolor-icon-theme, }: @@ -27,11 +27,12 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary. dontPatchELF = true; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 43eb7004e36b..526147fe0248 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -2,7 +2,7 @@ lib, stdenv, capnproto, - extra-cmake-modules, + kdePackages, fetchFromGitHub, fontconfig, installShellFiles, @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ capnproto - extra-cmake-modules + kdePackages.extra-cmake-modules installShellFiles pkg-config protobuf diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index e1d2843c3f93..46ac449b10d6 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -23,7 +23,7 @@ enableOpencv ? stdenv.hostPlatform.isLinux, opencv, enableWayland ? stdenv.hostPlatform.isLinux, - extra-cmake-modules, + kdePackages, wayland, wayland-protocols, wayland-scanner, @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { opencv ] ++ lib.optionals enableWayland [ - extra-cmake-modules + kdePackages.extra-cmake-modules wayland wayland-protocols ] diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix index 2bacf54729d9..183a7c5b814a 100644 --- a/pkgs/by-name/wl/wlay/package.nix +++ b/pkgs/by-name/wl/wlay/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, glfw3, libx11, libxau, @@ -30,12 +30,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config wayland-scanner ]; buildInputs = [ + kdePackages.extra-cmake-modules glfw3 libx11 libxau diff --git a/pkgs/by-name/x2/x2goclient/package.nix b/pkgs/by-name/x2/x2goclient/package.nix index 623e5aec9e0f..99073bcc7865 100644 --- a/pkgs/by-name/x2/x2goclient/package.nix +++ b/pkgs/by-name/x2/x2goclient/package.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { cups libxpm libssh - libsForQt5.phonon libsForQt5.qtbase libsForQt5.qtsvg libsForQt5.qttools diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix index 185fbb26b8dd..2f29a4ebe58f 100644 --- a/pkgs/by-name/xc/xcb-imdkit/package.nix +++ b/pkgs/by-name/xc/xcb-imdkit/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, uthash, libxcb-util, libxcb-keysyms, @@ -25,12 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules xorgproto uthash ]; buildInputs = [ + kdePackages.extra-cmake-modules libxcb-util libxcb-keysyms ]; diff --git a/pkgs/by-name/za/zafiro-icons/package.nix b/pkgs/by-name/za/zafiro-icons/package.nix index 27147a4c3c8c..8217a45db1ab 100644 --- a/pkgs/by-name/za/zafiro-icons/package.nix +++ b/pkgs/by-name/za/zafiro-icons/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - libsForQt5, + kdePackages, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme numix-icon-theme numix-icon-theme-circle @@ -38,6 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; dontPatchELF = true; dontRewriteSymlinks = true; diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix index d8138090e767..ffc6b3564508 100644 --- a/pkgs/by-name/ze/zeal/package.nix +++ b/pkgs/by-name/ze/zeal/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, pkg-config, httplib, libarchive, @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config qt6.wrapQtAppsHook ]; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix deleted file mode 100644 index 86b2590685de..000000000000 --- a/pkgs/data/themes/qtcurve/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - pkg-config, - mkDerivation, - gtk2Support ? true, - gtk2, - qtbase, - qtsvg, - qtx11extras, # Toolkit dependencies - karchive, - kconfig, - kconfigwidgets, - kio, - frameworkintegration, - kguiaddons, - ki18n, - kwindowsystem, - kdelibs4support, - kiconthemes, - libpthread-stubs, - pcre, - libxdmcp, - libx11, - libxau, # X11 dependencies - fetchpatch, -}: - -mkDerivation rec { - pname = "qtcurve"; - version = "1.9.1"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "qtcurve"; - rev = version; - sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; - }; - - patches = [ - # Fix build with CMake 4 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/d2c84577505641e647fbb64bce825b3e0a4129f5.patch"; - sha256 = "sha256-WBmzlVDxRNXZmi6c03cR1MuIr+hBaeFXgNLzhsv0bZo="; - }) - # Remove unnecessary constexpr, this is not allowed in C++14 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; - sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; - }) - # Fix build with Qt5.15 - (fetchpatch { - url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; - sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek="; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - qtbase - qtsvg - qtx11extras - karchive - kconfig - kconfigwidgets - kio - kiconthemes - kguiaddons - ki18n - kwindowsystem - kdelibs4support - frameworkintegration - libpthread-stubs - pcre - libxdmcp - libx11 - libxau - ] - ++ lib.optional gtk2Support gtk2; - - preConfigure = '' - for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt - do - substituteInPlace $i \ - --replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}" - done - substituteInPlace CMakeLists.txt \ - --replace \$\{GTK2_PREFIX\} $out - substituteInPlace gtk2/style/CMakeLists.txt \ - --replace \$\{GTK2_LIBDIR\} $out/lib - patchShebangs tools/gen-version.sh - ''; - - configureFlags = [ - "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}" - "-DENABLE_QT4=OFF" - ]; - - meta = { - homepage = "https://github.com/QtCurve/qtcurve"; - description = "Widget styles for Qt5/Plasma 5 and gtk2"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix index dddddd97ae67..05e3a86e519b 100644 --- a/pkgs/development/libraries/futuresql/default.nix +++ b/pkgs/development/libraries/futuresql/default.nix @@ -1,9 +1,8 @@ { stdenv, - lib, fetchurl, cmake, - extra-cmake-modules, + kdePackages, qtbase, }: stdenv.mkDerivation rec { @@ -17,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ]; buildInputs = [ qtbase ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ]; # a library, nothing to wrap dontWrapQtApps = true; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix deleted file mode 100644 index e04804e60f84..000000000000 --- a/pkgs/development/libraries/kdb/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitLab, - extra-cmake-modules, - qtbase, - kcoreaddons, - python3, - sqlite, - libpq, - libmysqlclient, - qttools, -}: - -mkDerivation { - pname = "kdb"; - version = "3.2.0-unstable-2025-10-17"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kdb"; - rev = "819f9f61d629ffd80990ae17ae6c8078721a142b"; - hash = "sha256-XkpFFzTgLEjPxEzwinbGhHRTULQrhl5TdakJlQuI27A="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - buildInputs = [ - kcoreaddons - python3 - sqlite - libpq - libmysqlclient - ]; - - propagatedBuildInputs = [ qtbase ]; - - meta = { - description = "Database connectivity and creation framework for various database vendors"; - mainProgram = "kdb3_sqlite3_dump"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 69fe068ef980..720987111984 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, }: mkDerivation { pname = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qtbase ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 1b1176ba8f6b..c9fb1668bb47 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, gtk3, qtsvg, @@ -9,6 +10,7 @@ mkDerivation { pname = "breeze-icons"; nativeBuildInputs = [ + cmake extra-cmake-modules gtk3 ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index ea46176de9fe..702a7f53b745 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -27,6 +27,7 @@ libsForQt5, lib, fetchurl, + kdePackages, }: let @@ -140,7 +141,7 @@ let in ( { - extra-cmake-modules = callPackage ./extra-cmake-modules { }; + inherit (kdePackages) extra-cmake-modules; # TIER 1 attica = callPackage ./attica.nix { }; @@ -154,11 +155,8 @@ let 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 { }; @@ -175,63 +173,64 @@ let kjobwidgets = callPackage ./kjobwidgets.nix { }; knotifications = callPackage ./knotifications.nix { }; kpackage = callPackage ./kpackage { }; - kunitconversion = callPackage ./kunitconversion.nix { }; syndication = callPackage ./syndication.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 { }; - - # PORTING AIDS - kdelibs4support = callPackage ./kdelibs4support { }; - kdesignerplugin = callPackage ./kdesignerplugin.nix { }; } // lib.optionalAttrs config.allowAliases { baloo = mkThrow "baloo"; bluez-qt = mkThrow "bluez-qt"; kapidox = mkThrow "kapidox"; + kcmutils = mkThrow "kcmutils"; kcontacts = mkThrow "kcontacts"; kdav = mkThrow "kdav"; + kdeclarative = mkThrow "kdeclarative"; + kdelibs4support = mkThrow "kdelibs4support"; + kdesignerplugin = mkThrow "kdesignerplugin"; kdesu = mkThrow "kdesu"; + kemoticons = mkThrow "kemoticons"; kfilemetadata = mkThrow "kfilemetadata"; kholidays = mkThrow "kholidays"; khtml = mkThrow "kthml"; kimageformats = mkThrow "kimageformats"; + kidletime = mkThrow "kidletime"; + kinit = mkThrow "kinit"; + kitemmodels = mkThrow "kitemmodels"; kjs = mkThrow "kjs"; kjsembed = mkThrow "kjsembed"; kmediaplayer = mkThrow "kmediaplayer"; + knotifyconfig = mkThrow "knotifyconfig"; + kparts = mkThrow "kparts"; kpeople = mkThrow "kpeople"; + kplotting = mkThrow "kplotting"; kpty = mkThrow "kpty"; kpurpose = mkThrow "kpurpose"; kquickcharts = mkThrow "kquickcharts"; kross = mkThrow "kross"; krunner = mkThrow "krunner"; ktexteditor = mkThrow "ktexteditor"; + kunitconversion = mkThrow "kunitconversion"; kxmlrpcclient = mkThrow "kxmlrpcclient"; modemmanager-qt = mkThrow "modemmanager-qt"; networkmanager-qt = mkThrow "networkmanager-qt"; oxygen-icons = mkThrow "oxygen-icons"; oxygen-icons5 = mkThrow "oxygen-icons"; + plasma-framework = mkThrow "plasma-framework"; prison = mkThrow "prison"; qqc2-desktop-style = mkThrow "qqc2-desktop-style"; threadweaver = mkThrow "threadweaver"; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix deleted file mode 100644 index ce8b89ef80bd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - lib, - fetchpatch, - bash, - cmake, - pkg-config, -}: - -mkDerivation { - pname = "extra-cmake-modules"; - - patches = [ - # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 - (fetchpatch { - url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch"; - sha256 = "10y36fc3hnpmcsmjgfxn1rp4chj5yrhgghj7m8gbmcai1q5jr0xj"; - }) - ]; - - outputs = [ "out" ]; # this package has no runtime components - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - bash - ]; - - # note: these will be propagated into the same list extra-cmake-modules is in - propagatedBuildInputs = [ - cmake - pkg-config - ]; - - strictDeps = true; - - setupHook = ./setup-hook.sh; - - meta = { - platforms = lib.platforms.linux ++ lib.platforms.darwin; - homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index b9205856425c..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,123 +0,0 @@ -ecmCMakeFlags() { - appendToVar cmakeFlags "-DECM_DIR=@out@/share/ECM/cmake" -} - -preConfigureHooks+=(ecmCMakeFlags) - -ecmEnvHook() { - addToSearchPath XDG_DATA_DIRS "$1/share" - addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" -} -addEnvHooks "$targetOffset" ecmEnvHook - -ecmPostHook() { - # Because we need to use absolute paths here, we must set *all* the paths. - appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin" - appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" - appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var" - appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" - appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share" - appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" - appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" - appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" - appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" - appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" - appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" - appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" - appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" - appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" - appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" - appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" - appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" - appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" - appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/metainfo" - appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man" - appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" - appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" - appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" - appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" - appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" - - if [ "$(uname)" = "Darwin" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" - fi - - if [ -n "${qtPluginPrefix-}" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" - appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" - fi - - if [ -n "${qtQmlPrefix-}" ]; then - appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" - fi -} -postHooks+=(ecmPostHook) - -xdgDataSubdirs=( \ - "config.kcfg" "kconf_update" "kservices5" "kservicetypes5" \ - "kxmlgui5" "knotifications5" "icons" "locale" "sounds" "templates" \ - "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ -) - -# ecmHostPathsSeen is an associative array of the paths that have already been -# seen by ecmHostPathHook. -declare -gA ecmHostPathsSeen - -ecmHostPathIsNotSeen() { - if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then - # The path has been seen before. - return 1 - else - # The path has not been seen before. - # Now it is seen, so record it. - ecmHostPathsSeen["$1"]=1 - return 0 - fi -} - -ecmHostPathHook() { - ecmHostPathIsNotSeen "$1" || return 0 - - local xdgConfigDir="$1/etc/xdg" - if [ -d "$xdgConfigDir" ] - then - qtWrapperArgs+=(--prefix XDG_CONFIG_DIRS : "$xdgConfigDir") - fi - - for xdgDataSubdir in "${xdgDataSubdirs[@]}" - do - if [ -d "$1/share/$xdgDataSubdir" ] - then - qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$1/share") - break - fi - done - - local manDir="$1/man" - if [ -d "$manDir" ] - then - qtWrapperArgs+=(--prefix MANPATH : "$manDir") - fi - - local infoDir="$1/info" - if [ -d "$infoDir" ] - then - qtWrapperArgs+=(--prefix INFOPATH : "$infoDir") - fi - - if [ -d "$1/dbus-1" ] - then - appendToVar propagatedUserEnvPkgs "$1" - fi -} -addEnvHooks "$targetOffset" ecmHostPathHook diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index bda5fe20d868..69ffb454a690 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kbookmarks, kcompletion, @@ -18,7 +19,10 @@ mkDerivation { pname = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kbookmarks kcompletion diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index f69797dd8386..bcf2d97dce81 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, + cmake, extra-cmake-modules, boost, kactivities, @@ -10,7 +11,10 @@ mkDerivation { pname = "kactivities-stats"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ boost kactivities diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 67ae3d5a58bf..fa1cedc61365 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, boost, kconfig, @@ -12,7 +13,10 @@ mkDerivation { pname = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ boost kconfig diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 0eb468244092..1b61ef1fffcf 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, bzip2, xz, @@ -12,6 +13,7 @@ mkDerivation { pname = "karchive"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index b0943132b228..0206b38f35c4 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -3,6 +3,7 @@ stdenv, mkDerivation, propagate, + cmake, extra-cmake-modules, kcoreaddons, qttools, @@ -12,7 +13,10 @@ mkDerivation { pname = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index f74215126f64..b0f013ff6bc1 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcodecs, @@ -15,6 +16,7 @@ mkDerivation { pname = "kbookmarks"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index cdce670ac423..b2051eb89bc6 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, libical, }: mkDerivation { pname = "kcalendarcore"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedBuildInputs = [ libical ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils.nix b/pkgs/development/libraries/kde-frameworks/kcmutils.nix deleted file mode 100644 index 22d5df058af2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcmutils.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfigwidgets, - kcoreaddons, - kdeclarative, - ki18n, - kiconthemes, - kitemviews, - kpackage, - kservice, - kxmlgui, - qtdeclarative, -}: - -mkDerivation { - pname = "kcmutils"; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - kpackage - kxmlgui - qtdeclarative - ]; - propagatedBuildInputs = [ - kconfigwidgets - kservice - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 2b27c145750f..4a1f82f81566 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools gperf diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index e99b2bb3998a..991b54aafcba 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kwidgetsaddons, @@ -9,7 +10,10 @@ mkDerivation { pname = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index f703b4e56472..52c05e13b05a 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -11,7 +12,10 @@ mkDerivation { "out" "dev" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix index 6f3c7717360d..6a138df9ea85 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kauth, kcodecs, @@ -15,6 +16,7 @@ mkDerivation { pname = "kconfigwidgets"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f931a5e4f31e..dfb8c80474be 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools shared-mime-info diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 50b258af73b1..cec7b33620e8 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kcoreaddons, kwindowsystem, @@ -9,7 +10,10 @@ mkDerivation { pname = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcoreaddons kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eeb10affd913..f06b3f69910e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -8,7 +9,10 @@ mkDerivation { pname = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools qtx11extras diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix deleted file mode 100644 index 923252690089..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - libepoxy, - kconfig, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - kpackage, - kwidgetsaddons, - kwindowsystem, - qtdeclarative, -}: - -mkDerivation { - pname = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libepoxy - kglobalaccel - kguiaddons - ki18n - kiconthemes - kio - kwidgetsaddons - kwindowsystem - ]; - propagatedBuildInputs = [ - kconfig - kpackage - qtdeclarative - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 8d35628ff2ae..d084bdbdebc3 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -3,6 +3,7 @@ lib, propagate, wrapGAppsHook3, + cmake, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, @@ -17,6 +18,7 @@ mkDerivation { pname = "kded"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools wrapGAppsHook3 diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix deleted file mode 100644 index 50d2b42978f7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - mkDerivation, - docbook_xml_dtd_45, - extra-cmake-modules, - kdoctools, - kauth, - karchive, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kdbusaddons, - kded, - kdesignerplugin, - kemoticons, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - kitemmodels, - kinit, - knotifications, - kparts, - kservice, - ktextwidgets, - kunitconversion, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - networkmanager, - qtbase, - qtsvg, - qttools, - qtx11extras, - libsm, -}: - -mkDerivation { - pname = "kdelibs4support"; - patches = [ - ./nix-kde-include-dir.patch - ]; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - propagatedNativeBuildInputs = [ kdoctools ]; - buildInputs = [ - kcompletion - kconfig - kded - kglobalaccel - ki18n - kio - kservice - kwidgetsaddons - kxmlgui - networkmanager - qtsvg - qtx11extras - libsm - ]; - propagatedBuildInputs = [ - kauth - karchive - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdesignerplugin - kemoticons - kguiaddons - kiconthemes - kitemmodels - kinit - knotifications - kparts - ktextwidgets - kunitconversion - kwindowsystem - qtbase - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch deleted file mode 100644 index eabb70254483..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -=================================================================== ---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp -+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -@@ -292,7 +292,7 @@ static QString relativeInstallPath(const - return QFile::decodeName(ICON_INSTALL_DIR "/"); - } - if (strcmp("include", type) == 0) { -- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); -+ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); - } - break; - case 'l': diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh deleted file mode 100644 index 21ac2e83b5da..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix deleted file mode 100644 index 9a81d0c758e1..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kiconthemes, - kio, - kitemviews, - kplotting, - ktextwidgets, - kwidgetsaddons, - kxmlgui, - qttools, - sonnet, -}: - -mkDerivation { - pname = "kdesignerplugin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kio - kitemviews - kplotting - ktextwidgets - kwidgetsaddons - kxmlgui - sonnet - ]; - propagatedBuildInputs = [ qttools ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 081624f35111..4478be2d3e8d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, avahi, qtbase, @@ -8,7 +9,10 @@ mkDerivation { pname = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ avahi qttools diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 377a102c8a57..fd708d7d735a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -3,6 +3,7 @@ lib, stdenv, fetchpatch, + cmake, extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, @@ -16,6 +17,7 @@ mkDerivation { pname = "kdoctools"; nativeBuildInputs = [ + cmake extra-cmake-modules # The build system insists on having native Perl. perl diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix deleted file mode 100644 index 27f236df2085..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - karchive, - kcoreaddons, - kservice, - qtbase, -}: - -mkDerivation { - pname = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - kcoreaddons - ]; - propagatedBuildInputs = [ - kservice - qtbase - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 766bc3dec3ed..8e5e2d4a78ba 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kcoreaddons, @@ -15,7 +16,10 @@ mkDerivation { pname = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index f86b9a31f87d..4619dea4f081 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -2,18 +2,22 @@ lib, stdenv, mkDerivation, + cmake, + pkg-config, extra-cmake-modules, wayland-scanner, qtbase, qtx11extras, wayland, - plasma-wayland-protocols, + kdePackages, }: mkDerivation { pname = "kguiaddons"; nativeBuildInputs = [ + cmake + pkg-config extra-cmake-modules ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -24,7 +28,7 @@ mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - plasma-wayland-protocols + kdePackages.plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 5c14db74ef1b..17dfd6e5a8d7 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, gettext, python3, @@ -9,7 +10,10 @@ mkDerivation { pname = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedNativeBuildInputs = [ gettext python3 diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 69a0ab745610..a1470e6cf69a 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, breeze-icons, karchive, @@ -17,7 +18,10 @@ mkDerivation { patches = [ ./default-theme-breeze.patch ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ breeze-icons karchive diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix deleted file mode 100644 index 34667dbd582a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - wayland-scanner, - qtbase, - qtx11extras, - wayland, - wayland-protocols, - plasma-wayland-protocols, -}: - -mkDerivation { - pname = "kidletime"; - nativeBuildInputs = [ - extra-cmake-modules - wayland-scanner - ]; - buildInputs = [ - qtx11extras - wayland - wayland-protocols - plasma-wayland-protocols - ]; - propagatedBuildInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch deleted file mode 100644 index f9c019c2ae2a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 16 Feb 2020 14:23:44 -0600 -Subject: [PATCH 2/4] start_kdeinit-path - ---- - src/start_kdeinit/start_kdeinit_wrapper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c -index 891f50c..ef664ad 100644 ---- a/src/start_kdeinit/start_kdeinit_wrapper.c -+++ b/src/start_kdeinit/start_kdeinit_wrapper.c -@@ -11,7 +11,7 @@ - #include - #include - --#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -+#define EXECUTE "/run/wrappers/bin/start_kdeinit" - - #if KDEINIT_OOM_PROTECT - --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch deleted file mode 100644 index 499c975a9e2d..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 16 Feb 2020 14:24:07 -0600 -Subject: [PATCH 3/4] kdeinit-extra-libs - ---- - src/kdeinit/kinit.cpp | 22 ++++------------------ - 1 file changed, 4 insertions(+), 18 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 0801b75..622dd5f 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -96,9 +96,9 @@ static const char *extra_libs[] = { - "libKF5Parts.5.dylib", - "libKF5Plasma.5.dylib" - #else -- "libKF5KIOCore.so.5", -- "libKF5Parts.so.5", -- "libKF5Plasma.so.5" -+ NIXPKGS_KF5_KIOCORE, -+ NIXPKGS_KF5_PARTS, -+ NIXPKGS_KF5_PLASMA - #endif - }; - #endif -@@ -1524,20 +1524,6 @@ static int initXconnection() - } - #endif - --#ifndef Q_OS_OSX --// Find a shared lib in the lib dir, e.g. libkio.so. --// Completely unrelated to plugins. --static QString findSharedLib(const QString &lib) --{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib; -- if (QFile::exists(path)) { -- return path; -- } -- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -- return QString(); --} --#endif -- - extern "C" { - - static void secondary_child_handler(int) -@@ -1679,7 +1665,7 @@ int main(int argc, char **argv) - #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) - if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { - for (const char *extra_lib : extra_libs) { -- const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); -+ const QString extra = QString::fromLatin1(extra_lib); - if (!extra.isEmpty()) { - QLibrary l(extra); - l.setLoadHints(QLibrary::ExportExternalSymbolsHint); --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch deleted file mode 100644 index 2996342deadb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 17 Feb 2020 04:45:03 -0600 -Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit - ---- - src/start_kdeinit/start_kdeinit.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c -index f2db3e9..4ff2602 100644 ---- a/src/start_kdeinit/start_kdeinit.c -+++ b/src/start_kdeinit/start_kdeinit.c -@@ -148,7 +148,11 @@ int main(int argc, char **argv) - ++i) { - unsigned len; - if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) -- && len && len < (1 << 12)) { -+ && len) { -+ if (len >= (1 << 20)) { -+ fprintf(stderr, "%s: exceeded environment length limit", argv[0]); -+ return 1; -+ } - env[ i ] = malloc(len + 1); - if ((unsigned) read(0, env[ i ], len) == len) { - env[ i ][ len ] = '\0'; --- -2.23.1 - diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix deleted file mode 100644 index 533af32e64bb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - writeScript, - extra-cmake-modules, - kdoctools, - kconfig, - kcrash, - ki18n, - kio, - kparts, - kservice, - kwindowsystem, - plasma-framework, -}: - -let - inherit (lib) getLib; -in - -mkDerivation { - pname = "kinit"; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kcrash - ki18n - kio - kservice - kwindowsystem - ]; - patches = [ - ./0002-start_kdeinit-path.patch - ./0003-kdeinit-extra-libs.patch - ./0004-start_kdeinit-environ-hard-limit.patch - ]; - env.CXXFLAGS = toString ( - [ - ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' - ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' - ] - ); - setupHook = writeScript "setup-hook.sh" '' - kinitFixupOutputHook() { - if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then - mkdir -p ''${!outputBin}/lib - find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \; - rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib - fi - } - - fixupOutputHooks+=(kinitFixupOutputHook) - ''; -} diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 2728ac681f35..8da48bc568c7 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -2,6 +2,7 @@ stdenv, lib, mkDerivation, + cmake, extra-cmake-modules, kdoctools, qttools, @@ -38,6 +39,7 @@ mkDerivation { pname = "kio"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 0f56f7c95365..54ed41bd834a 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qtquickcontrols2, @@ -10,6 +11,7 @@ mkDerivation { pname = "kirigami2"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix deleted file mode 100644 index 4078944be08a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, -}: - -mkDerivation { - pname = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtbase ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 526c88c5cb59..81df6bb30535 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -7,7 +8,10 @@ mkDerivation { pname = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; outputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 9be6428824db..a478c6279cfc 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcoreaddons, @@ -10,6 +11,7 @@ mkDerivation { pname = "kjobwidgets"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index cfc59cbf1a37..c0749c0536b8 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, attica, karchive, @@ -23,7 +24,10 @@ mkDerivation { pname = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ karchive kcompletion diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 61e2dd02dc94..44b94f0c53ae 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -2,12 +2,13 @@ mkDerivation, lib, stdenv, + cmake, extra-cmake-modules, kcodecs, kconfig, kcoreaddons, kwindowsystem, - phonon, + libcanberra, qttools, qtx11extras, qtmacextras, @@ -17,6 +18,7 @@ mkDerivation { pname = "knotifications"; nativeBuildInputs = [ + cmake extra-cmake-modules qttools ]; @@ -25,7 +27,7 @@ mkDerivation { kconfig kcoreaddons kwindowsystem - phonon + libcanberra qtx11extras libdbusmenu-qt5 ] diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix deleted file mode 100644 index 1677ada272cd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcompletion, - kconfig, - ki18n, - kio, - phonon, - qtbase, -}: - -mkDerivation { - pname = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion - kconfig - ki18n - kio - phonon - ]; - propagatedBuildInputs = [ qtbase ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 282ddbb3e772..68480da4351a 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kdoctools, karchive, @@ -12,6 +13,7 @@ mkDerivation { pname = "kpackage"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix deleted file mode 100644 index b3f894663537..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - kcoreaddons, - ki18n, - kiconthemes, - kio, - kjobwidgets, - knotifications, - kservice, - ktextwidgets, - kwidgetsaddons, - kxmlgui, -}: - -mkDerivation { - pname = "kparts"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig - kcoreaddons - ki18n - kiconthemes - kjobwidgets - knotifications - kservice - kwidgetsaddons - ]; - propagatedBuildInputs = [ - kio - ktextwidgets - kxmlgui - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix deleted file mode 100644 index d2d2b76e1121..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qttools, - qtbase, -}: - -mkDerivation { - pname = "kplotting"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - qtbase - qttools - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index e819abe4be29..876067422e1c 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kconfig, kcoreaddons, @@ -17,7 +18,10 @@ let self = mkDerivation { pname = "krunner"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 7466e789a660..bc716b1f9411 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,6 +1,7 @@ { mkDerivation, bison, + cmake, extra-cmake-modules, flex, kconfig, @@ -17,6 +18,7 @@ mkDerivation { pname = "kservice"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index d66ce937972e..4ed3e3527403 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, kcompletion, @@ -15,7 +16,10 @@ mkDerivation { pname = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcompletion kconfig diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix deleted file mode 100644 index edd57f03890a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index 0999930fa785..137ff4513ff7 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, kdoctools, kconfig, @@ -21,6 +22,7 @@ mkDerivation { pname = "kwallet"; nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 014ee813cfbd..e9f76c10bed2 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,10 +1,11 @@ { mkDerivation, - propagateBin, lib, + cmake, + pkg-config, extra-cmake-modules, wayland-scanner, - plasma-wayland-protocols, + kdePackages, qtbase, wayland, wayland-protocols, @@ -22,15 +23,20 @@ mkDerivation { ]; nativeBuildInputs = [ + cmake + pkg-config extra-cmake-modules wayland-scanner ]; buildInputs = [ - plasma-wayland-protocols + kdePackages.plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; - setupHook = propagateBin; # XDG_CONFIG_DIRS + outputs = [ + "out" + "dev" + ]; meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 6b7c271f3f6b..e4b041011b09 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, qttools, @@ -7,7 +8,10 @@ mkDerivation { pname = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; outputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index dd94f7131e7c..59e1e948d4b5 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, libpthread-stubs, libxdmcp, @@ -10,7 +11,10 @@ mkDerivation { pname = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ libpthread-stubs libxdmcp diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index 35d01f5e7d89..e6eb400921b2 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, qttools, attica, @@ -21,7 +22,10 @@ mkDerivation { "out" "dev" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ attica kglobalaccel diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix deleted file mode 100644 index a2f8f948a452..000000000000 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kactivities, - karchive, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdeclarative, - kglobalaccel, - kguiaddons, - ki18n, - kiconthemes, - kio, - knotifications, - kpackage, - kservice, - kwayland, - kwindowsystem, - kxmlgui, - qtbase, - qtdeclarative, - qtscript, - qtx11extras, - kirigami2, - qtquickcontrols2, -}: - -mkDerivation { - pname = "plasma-framework"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kactivities - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - kguiaddons - ki18n - kiconthemes - kio - knotifications - kwayland - kwindowsystem - kxmlgui - qtdeclarative - qtscript - qtx11extras - qtquickcontrols2 - ]; - propagatedBuildInputs = [ - kpackage - kservice - qtbase - kirigami2 - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 41de202c3eed..d9cdbdc74ba7 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, intltool, qtbase, @@ -16,6 +17,7 @@ mkDerivation { pname = "purpose"; nativeBuildInputs = [ + cmake extra-cmake-modules intltool ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index ddb45ae6aa3f..066f9a9571b2 100644 --- a/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -3,6 +3,7 @@ lib, stdenv, bison, + cmake, extra-cmake-modules, flex, media-player-info, @@ -16,6 +17,7 @@ mkDerivation { patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison + cmake extra-cmake-modules flex ] diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 351972ba5bb5..cb970d563a1f 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, aspell, hunspell, @@ -9,7 +10,10 @@ mkDerivation { pname = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ aspell hunspell diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix index 0b92afc313e2..d0ffb5c27e2f 100644 --- a/pkgs/development/libraries/kde-frameworks/syndication.nix +++ b/pkgs/development/libraries/kde-frameworks/syndication.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, + cmake, extra-cmake-modules, kcodecs, }: @@ -8,6 +9,13 @@ mkDerivation { pname = "syndication"; meta.maintainers = [ lib.maintainers.bkchr ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ kcodecs ]; + outputs = [ + "out" + "dev" + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 238087a11d0d..eccd593cf28c 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,5 +1,6 @@ { mkDerivation, + cmake, extra-cmake-modules, perl, qtbase, @@ -9,6 +10,7 @@ mkDerivation { pname = "syntax-highlighting"; nativeBuildInputs = [ + cmake extra-cmake-modules perl ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index fe2e6ce78b38..d8593d70ca38 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,12 +1,16 @@ { mkDerivation, + cmake, extra-cmake-modules, qtbase, }: mkDerivation { pname = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" diff --git a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch deleted file mode 100644 index e41de5e30ac7..000000000000 --- a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12dbdbb..22495bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.10) - - project( kdiagram ) - -diff --git a/src/KChart/CMakeLists.txt b/src/KChart/CMakeLists.txt -index 676b71f..a9a2928 100644 ---- a/src/KChart/CMakeLists.txt -+++ b/src/KChart/CMakeLists.txt -@@ -359,6 +359,7 @@ install(EXPORT KChartTargets - ecm_generate_pri_file( - BASE_NAME KChart - LIB_NAME KChart -+ VERSION ${KCHARTLIB_VERSION} - DEPS "widgets svg" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KChart -diff --git a/src/KGantt/CMakeLists.txt b/src/KGantt/CMakeLists.txt -index 107d762..5cbb254 100644 ---- a/src/KGantt/CMakeLists.txt -+++ b/src/KGantt/CMakeLists.txt -@@ -183,6 +183,7 @@ install(EXPORT KGanttTargets - ecm_generate_pri_file( - BASE_NAME KGantt - LIB_NAME KGantt -+ VERSION ${KGANTTLIB_VERSION} - DEPS "widgets printsupport" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KGantt diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix deleted file mode 100644 index e280ffbc21ac..000000000000 --- a/pkgs/development/libraries/kdiagram/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - fetchFromGitLab, - lib, - extra-cmake-modules, - qttools, - qtbase, - qtsvg, -}: - -mkDerivation rec { - pname = "kdiagram"; - version = "2.8.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "graphics"; - repo = "kdiagram"; - rev = "v${version}"; - sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8="; - }; - patches = [ - ./cmake-minimum-required.patch - ]; - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - propagatedBuildInputs = [ - qtbase - qtsvg - ]; - meta = { - description = "Libraries for creating business diagrams"; - license = lib.licenses.gpl2; - platforms = qtbase.meta.platforms; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix deleted file mode 100644 index c3e21c328691..000000000000 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitLab, - - cmake, - extra-cmake-modules, - - ki18n, - kirigami2, - qtquickcontrols2, -}: - -mkDerivation rec { - pname = "kirigami-addons"; - version = "0.11.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kirigami-addons"; - rev = "v${version}"; - hash = "sha256-KTkEfGmQf9kj+9e/rJM7jd/4BqubDLu5/oLkX88uENA="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - ki18n - kirigami2 - qtquickcontrols2 - ]; - - meta = { - description = "Add-ons for the Kirigami framework"; - homepage = "https://invent.kde.org/libraries/kirigami-addons"; - # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5 - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - }; -} diff --git a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch deleted file mode 100644 index 9d7143b66a15..000000000000 --- a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d589d5..0e1390f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - set(KPROPERTY_GENERATE_PRI TRUE) --cmake_minimum_required(VERSION 3.0 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.10 FATAL_ERROR) - find_package(ECM 1.8.0 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - include(SetKPropertyCMakePolicies NO_POLICY_SCOPE) -diff --git a/cmake/modules/SetKPropertyCMakePolicies.cmake b/cmake/modules/SetKPropertyCMakePolicies.cmake -index bc28d8a..85370c2 100644 ---- a/cmake/modules/SetKPropertyCMakePolicies.cmake -+++ b/cmake/modules/SetKPropertyCMakePolicies.cmake -@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's - # "Simplify variable reference and escape sequence evaluation" - - if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property. -- cmake_policy(SET CMP0059 OLD) -+ cmake_policy(SET CMP0059 NEW) - endif() - if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3) - cmake_policy(SET CMP0063 NEW) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix deleted file mode 100644 index 674e40d891dc..000000000000 --- a/pkgs/development/libraries/kproperty/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - extra-cmake-modules, - qtbase, - kconfig, - kcoreaddons, - kwidgetsaddons, - kguiaddons, - qttools, -}: - -mkDerivation rec { - pname = "kproperty"; - version = "3.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; - }; - - patches = [ - ./cmake-minimum-required.patch - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kconfig - kcoreaddons - kwidgetsaddons - kguiaddons - qttools - ]; - - propagatedBuildInputs = [ qtbase ]; - - meta = { - description = "Property editing framework with editor widget similar to what is known from Qt Designer"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/libraries/kquickimageedit/0.3.0.nix b/pkgs/development/libraries/kquickimageedit/0.3.0.nix deleted file mode 100644 index 95b6094db054..000000000000 --- a/pkgs/development/libraries/kquickimageedit/0.3.0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - extra-cmake-modules, - qtbase, - qtdeclarative, -}: - -stdenv.mkDerivation rec { - pname = "kquickimageeditor"; - version = "0.3.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = "kquickimageeditor"; - rev = "v${version}"; - sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - qtdeclarative - ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; - dontWrapQtApps = true; - - meta = { - description = "Set of QtQuick components providing basic image editing capabilities"; - homepage = "https://invent.kde.org/libraries/kquickimageeditor"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index 5e2ea565969e..561d4cd3d357 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitLab, - extra-cmake-modules, + cmake, kdePackages, qtbase, qtdeclarative, @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-MluY8nkMtg1uLAStDZFDxyJoeDrcp3smZ4U5IG5sXMk="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; buildInputs = [ kdePackages.kirigami qtbase diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix deleted file mode 100644 index f4da50b1fabb..000000000000 --- a/pkgs/development/libraries/kuserfeedback/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - mkDerivation, - fetchurl, - extra-cmake-modules, - qttools, -}: -mkDerivation rec { - pname = "kuserfeedback"; - version = "1.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - meta = { - license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.k900 ]; - description = "Framework for collecting user feedback for apps via telemetry and surveys"; - }; -} diff --git a/pkgs/development/libraries/libqaccessibilityclient/default.nix b/pkgs/development/libraries/libqaccessibilityclient/default.nix index 4522f7ad6bbd..d0901b6e5c24 100644 --- a/pkgs/development/libraries/libqaccessibilityclient/default.nix +++ b/pkgs/development/libraries/libqaccessibilityclient/default.nix @@ -4,7 +4,7 @@ fetchurl, cmake, qtbase, - extra-cmake-modules, + kdePackages, }: stdenv.mkDerivation rec { @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules ]; buildInputs = [ qtbase ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ]; outputs = [ "out" diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix deleted file mode 100644 index 722ae70fc806..000000000000 --- a/pkgs/development/libraries/maui-core/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - mkDerivation, - libcanberra, - pulseaudio, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kio, - kidletime, -}: - -mkDerivation rec { - pname = "maui-core"; - version = "0.6.6"; - - src = fetchFromGitHub { - owner = "Nitrux"; - repo = "maui-core"; - tag = "v${version}"; - sha256 = "sha256-o0Xwh9w0cClMw85FwpQB9CNWoSnzARxs6aGfvCA4BhA="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kidletime - kio - libcanberra - pulseaudio - ]; - - meta = { - description = "Core libraries to manage the desktop to be shared between Maui Settings and Cask"; - homepage = "https://github.com/Nitrux/maui-core"; - # Missing license information https://github.com/Nitrux/maui-core/issues/1 - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch deleted file mode 100644 index 39c1b9c0d290..000000000000 --- a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: phonon-gstreamer-4.9.0/gstreamer/backend.cpp -=================================================================== ---- phonon-gstreamer-4.9.0.orig/gstreamer/backend.cpp -+++ phonon-gstreamer-4.9.0/gstreamer/backend.cpp -@@ -85,6 +85,8 @@ Backend::Backend(QObject *parent, const - "--gst-debug-no-color" - }; - -+ qputenv("GST_PLUGIN_PATH_1_0", GST_PLUGIN_PATH_1_0); -+ - int argc = sizeof(args) / sizeof(*args); - char **argv = const_cast(args); - GError *err = 0; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix deleted file mode 100644 index 1c7511becab1..000000000000 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch, - cmake, - gst_all_1, - phonon, - pkg-config, - extra-cmake-modules, - qttools, - qtbase, - qtx11extras, - debug ? false, -}: - -stdenv.mkDerivation rec { - pname = "phonon-backend-gstreamer"; - version = "4.10.0"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; - }; - - patches = [ - # Hardcode paths to useful plugins so the backend doesn't depend - # on system paths being set. - ./gst-plugin-paths.patch - - # Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release. - (fetchpatch { - url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch"; - sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8="; - }) - ]; - - dontWrapQtApps = true; - - env.NIX_CFLAGS_COMPILE = - let - gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" ( - with gst_all_1; - [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ] - ); - in - toString [ - # This flag should be picked up through pkg-config, but it isn't. - "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" - - ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' - ]; - - buildInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - phonon - qtbase - qtx11extras - ]; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - qttools - ]; - - cmakeBuildType = if debug then "Debug" else "Release"; - - meta = { - homepage = "https://phonon.kde.org/"; - description = "GStreamer backend for Phonon"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix deleted file mode 100644 index b262d7ce71dc..000000000000 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - phonon, - pkg-config, - libvlc, - extra-cmake-modules, - qttools, - qtbase, - qtx11extras, - debug ? false, -}: - -stdenv.mkDerivation rec { - pname = "phonon-backend-vlc"; - version = "0.11.3"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c="; - }; - - buildInputs = [ - phonon - libvlc - qtbase - qtx11extras - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - extra-cmake-modules - ]; - - dontWrapQtApps = true; - - cmakeBuildType = if debug then "Debug" else "Release"; - - meta = { - homepage = "https://community.kde.org/Phonon"; - # Dev repo is at https://invent.kde.org/libraries/phonon-vlc - description = "GStreamer backend for Phonon"; - platforms = lib.platforms.linux; - license = with lib.licenses; [ - bsd3 - lgpl21Plus - ]; - }; -} diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix deleted file mode 100644 index 2e04bf90440c..000000000000 --- a/pkgs/development/libraries/phonon/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - libGLU, - libGL, - pkg-config, - libpulseaudio, - extra-cmake-modules, - qtbase, - qttools, - debug ? false, -}: - -let - soname = "phonon4qt5"; - buildsystemdir = "share/cmake/${soname}"; -in - -stdenv.mkDerivation rec { - pname = "phonon"; - version = "4.11.1"; - - meta = { - homepage = "https://community.kde.org/Phonon"; - description = "Multimedia API for Qt"; - mainProgram = "phononsettings"; - license = lib.licenses.lgpl2; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ttuegel ]; - }; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${version}/phonon-${version}.tar.xz"; - sha256 = "0bfy8iqmjhlg3ma3iqd3kxjc2zkzpjgashbpf5x17y0dc2i1whxl"; - }; - - buildInputs = [ - libGLU - libGL - libpulseaudio - qtbase - qttools - ]; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - ]; - - outputs = [ - "out" - "dev" - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - [ - "-fPIC" - ] - ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=enum-constexpr-conversion" - ] - ); - - cmakeBuildType = if debug then "Debug" else "Release"; - - dontWrapQtApps = true; - - preConfigure = '' - appendToVar cmakeFlags "-DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" - appendToVar cmakeFlags "-DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" - appendToVar cmakeFlags "-DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer" - ''; - - postPatch = '' - sed -i PhononConfig.cmake.in \ - -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \ - -e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \ - -e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|" - - sed -i cmake/FindPhononInternal.cmake \ - -e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")" - - sed -i cmake/FindPhononInternal.cmake \ - -e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")" - - sed -i CMakeLists.txt \ - -e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")" - ''; - - postFixup = '' - sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \ - -e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin" - ''; -} diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix deleted file mode 100644 index 9de688a268bf..000000000000 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - fetchurl, - lib, - extra-cmake-modules, - qtbase, -}: - -mkDerivation rec { - pname = "plasma-wayland-protocols"; - version = "1.18.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM="; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ qtbase ]; - - meta = { - description = "Plasma Wayland Protocols"; - license = lib.licenses.lgpl21Plus; - platforms = qtbase.meta.platforms; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix deleted file mode 100644 index 3d1a91c748e5..000000000000 --- a/pkgs/development/libraries/pulseaudio-qt/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - pkg-config, - extra-cmake-modules, - wrapQtAppsHook, - pulseaudio, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pulseaudio-qt"; - version = "1.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${lib.versions.majorMinor finalAttrs.version}.tar.xz"; - sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - pulseaudio - ]; - - meta = { - description = "Pulseaudio bindings for Qt"; - homepage = "https://invent.kde.org/libraries/pulseaudio-qt"; - license = with lib.licenses; [ lgpl2 ]; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -}) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index fc9122f5cd72..61be4606df9d 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -8,7 +8,7 @@ qtbase, qtsvg, qtx11extras ? null, # Qt 5 only - kwindowsystem, + kwindowsystem ? null, # Qt 6 only qtwayland, libx11, libxext, diff --git a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch deleted file mode 100644 index 0f7d6e87b040..000000000000 --- a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7067dc..337c4ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.10) - project(massif-visualizer) - - set(QT_MIN_VERSION "5.2.0") diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix deleted file mode 100644 index 0b1c5009c972..000000000000 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - extra-cmake-modules, - shared-mime-info, - wrapQtAppsHook, - qtsvg, - qtxmlpatterns, - karchive, - kconfig, - kcoreaddons, - kparts, - kio, - ki18n, - kdiagram, - kgraphviewer, -}: - -stdenv.mkDerivation rec { - pname = "massif-visualizer"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; - }; - - patches = [ ./cmake-minimum-required.patch ]; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - wrapQtAppsHook - ]; - - buildInputs = [ - qtsvg - qtxmlpatterns - karchive - kconfig - kcoreaddons - kparts - kio - ki18n - kdiagram - kgraphviewer - ]; - - meta = { - description = "Tool that visualizes massif data generated by valgrind"; - mainProgram = "massif-visualizer"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix deleted file mode 100644 index ce8fc1d8ea23..000000000000 --- a/pkgs/development/tools/tora/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - makeWrapper, - qttools, - wrapQtAppsHook, - boost, - doxygen, - openssl, - libmysqlclient, - postgresql, - graphviz, - loki, - qscintilla, - qtbase, -}: - -stdenv.mkDerivation { - pname = "tora"; - version = "3.2.176"; - - src = fetchFromGitHub { - owner = "tora-tool"; - repo = "tora"; - rev = "39bf2837779bf458fc72a9f0e49271152e57829f"; - sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - boost - doxygen - graphviz - loki - libmysqlclient - openssl - postgresql # needs libecpg, which is not available in libpq package - qscintilla - qtbase - ]; - - preConfigure = '' - substituteInPlace src/widgets/toglobalsetting.cpp \ - --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"' - substituteInPlace extlibs/libermodel/dotgraph.cpp \ - --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot - ''; - - cmakeFlags = [ - "-DWANT_INTERNAL_LOKI=0" - "-DWANT_INTERNAL_QSCINTILLA=0" - # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name - "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include" - "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so" - "-DENABLE_DB2=0" - "-DENABLE_ORACLE=0" - "-DENABLE_TERADATA=0" - "-DQT5_BUILD=1" - "-Wno-dev" - ]; - - # these libraries are only searched for at runtime so we need to force-link them - env.NIX_LDFLAGS = toString [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - "-L${libmysqlclient}/lib/mariadb" - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.getBin graphviz}/bin" - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - description = "Tora SQL tool"; - mainProgram = "tora"; - maintainers = with lib.maintainers; [ peterhoeg ]; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - # fails to build on hydra since 2024 - broken = true; - }; -} diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 623eb89a127b..9a08af3eb75c 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -3,6 +3,8 @@ fetchurl, kio-extras, cmake, + pkg-config, + extra-cmake-modules, libsForQt5, samba, libssh, @@ -25,43 +27,47 @@ stdenv.mkDerivation rec { hash = "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk="; }; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = [ cmake + pkg-config extra-cmake-modules - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; - buildInputs = with libsForQt5; [ - qtbase + buildInputs = + with libsForQt5; + with libsForQt5.__internalKF5; + [ + qtbase - kactivities - kactivities-stats - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdnssd - kdoctools - kdsoap - kguiaddons - ki18n - kio - # libkexiv2 - phonon - solid - syntax-highlighting + kactivities + kactivities-stats + karchive + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdnssd + kdoctools + kdsoap + kguiaddons + ki18n + kio + # libkexiv2 + # phonon + solid + syntax-highlighting - samba - libssh - libmtp - libimobiledevice - gperf - libtirpc - openexr - taglib - libappimage - ]; + samba + libssh + libmtp + libimobiledevice + gperf + libtirpc + openexr + taglib + libappimage + ]; meta = kio-extras.meta; } diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index ee32c6ccbc42..2d7b54ab7530 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -31,17 +31,17 @@ mkKdeDerivation { "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 1f4790f09a29..236f7f098fb1 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -7,6 +7,7 @@ libsForQt5, wayland-scanner, + extra-cmake-modules, plasma-wayland-protocols, wayland, wayland-protocols, @@ -21,15 +22,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - libsForQt5.extra-cmake-modules + extra-cmake-modules ]; buildInputs = [ libsForQt5.qtbase libsForQt5.qtwayland - libsForQt5.kwayland - libsForQt5.kwindowsystem + libsForQt5.__internalKF5.kwayland + libsForQt5.__internalKF5.kwindowsystem plasma-wayland-protocols wayland diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix index 7d4eb0c37874..709405ef0a1b 100644 --- a/pkgs/kde/plasma/oxygen/default.nix +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -27,20 +27,20 @@ mkKdeDerivation { "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" - "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" - "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.__internalKF5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5Kirigami2_DIR=${libsForQt5.__internalKF5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index 1de1631826fe..4fbb8512d45c 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -39,26 +39,26 @@ mkKdeDerivation { "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" "-DQtWaylandScanner_EXECUTABLE=${libsForQt5.qtwayland.dev}/bin/qtwaylandscanner" - "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" - "-DKF5Bookmarks_DIR=${libsForQt5.kbookmarks.dev}/lib/cmake/KF5Bookmarks" - "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" - "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" - "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" - "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" - "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" - "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" - "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" - "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" - "-DKF5ItemViews_DIR=${libsForQt5.kitemviews.dev}/lib/cmake/KF5ItemViews" - "-DKF5JobWidgets_DIR=${libsForQt5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets" - "-DKF5KIO_DIR=${libsForQt5.kio.dev}/lib/cmake/KF5KIO" - "-DKF5Notifications_DIR=${libsForQt5.knotifications.dev}/lib/cmake/KF5Notifications" - "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" - "-DKF5Solid_DIR=${libsForQt5.solid.dev}/lib/cmake/KF5Solid" - "-DKF5Wayland_DIR=${libsForQt5.kwayland.dev}/lib/cmake/KF5Wayland" - "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" - "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" - "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" + "-DKF5Auth_DIR=${libsForQt5.__internalKF5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Bookmarks_DIR=${libsForQt5.__internalKF5.kbookmarks.dev}/lib/cmake/KF5Bookmarks" + "-DKF5Codecs_DIR=${libsForQt5.__internalKF5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Completion_DIR=${libsForQt5.__internalKF5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5Config_DIR=${libsForQt5.__internalKF5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.__internalKF5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.__internalKF5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5GuiAddons_DIR=${libsForQt5.__internalKF5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5I18n_DIR=${libsForQt5.__internalKF5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5IconThemes_DIR=${libsForQt5.__internalKF5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5ItemViews_DIR=${libsForQt5.__internalKF5.kitemviews.dev}/lib/cmake/KF5ItemViews" + "-DKF5JobWidgets_DIR=${libsForQt5.__internalKF5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets" + "-DKF5KIO_DIR=${libsForQt5.__internalKF5.kio.dev}/lib/cmake/KF5KIO" + "-DKF5Notifications_DIR=${libsForQt5.__internalKF5.knotifications.dev}/lib/cmake/KF5Notifications" + "-DKF5Service_DIR=${libsForQt5.__internalKF5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5Solid_DIR=${libsForQt5.__internalKF5.solid.dev}/lib/cmake/KF5Solid" + "-DKF5Wayland_DIR=${libsForQt5.__internalKF5.kwayland.dev}/lib/cmake/KF5Wayland" + "-DKF5WidgetsAddons_DIR=${libsForQt5.__internalKF5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.__internalKF5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5XmlGui_DIR=${libsForQt5.__internalKF5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; extraBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 900e7a3a5953..dffe6bbe34e7 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -5,7 +5,8 @@ fetchpatch, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, boost, gettext, libime, @@ -46,7 +47,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext fcitx5-lua ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 4c37576ecc04..884d77a7005d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, lua, gettext, @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 3674a7c0bb48..8502124a24d0 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + kdePackages, fcitx5, gettext, qtbase, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 931da19219ca..0bf72df3c504 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, cmake, - extra-cmake-modules, + kdePackages, gettext, fcitx5, fcitx5-qt, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules gettext pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 9d72e72cbf16..93c10d2ea130 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - extra-cmake-modules, + pkg-config, + kdePackages, fcitx5, fcitx5-qt, gettext, @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config + kdePackages.extra-cmake-modules gettext # msgfmt ]; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 9ad2eb2460d8..aa5fc1597bb4 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -2,7 +2,7 @@ lib, stdenv, cmake, - extra-cmake-modules, + kdePackages, pkg-config, itstool, udevCheckHook, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config itstool udevCheckHook diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 812128c0c029..bc24c8869673 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,30 +1,41 @@ { - fetchurl, + fetchFromGitLab, stdenv, - fetchpatch, lib, + cmake, extra-cmake-modules, kdoctools, wrapQtAppsHook, kconfig, kcrash, - kinit, + kwidgetsaddons, + kxmlgui, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kronometer"; - version = "2.3.0"; + version = "2.3.0-unstable-2026-04-06"; - src = fetchurl { - url = "mirror://kde/stable/kronometer/${version}/src/kronometer-${version}.tar.xz"; - sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "kronometer"; + rev = "ca1e662f4e58540bd072982103204fa1418f5657"; + hash = "sha256-IhKlFGxUqr7wKcNKnRA6gK9QJeR0QyQaSwYlIsr0wyE="; }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/utilities/kronometer/-/commit/949f1dccd48f4a1e3068e24d241c5ce73fe2ab8f.patch"; - hash = "sha256-zv9ty25vQXr3xB1S7QmXx3YIouOVUoMpdZ9gHBD1gMQ="; - }) + nativeBuildInputs = [ + cmake + extra-cmake-modules + kdoctools + wrapQtAppsHook + ]; + + buildInputs = [ + kconfig + kcrash + kwidgetsaddons + kxmlgui ]; meta = { @@ -34,14 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; mainProgram = "kronometer"; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - propagatedBuildInputs = [ - kconfig - kcrash - kinit - ]; } diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix deleted file mode 100644 index ea7902622c53..000000000000 --- a/pkgs/tools/security/kwalletcli/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - fetchFromGitHub, - lib, - stdenv, - makeWrapper, - pkg-config, - wrapQtAppsHook, - kcoreaddons, - ki18n, - kwallet, - mksh, - pinentry-qt, -}: - -stdenv.mkDerivation rec { - pname = "kwalletcli"; - version = "3.03"; - - src = fetchFromGitHub { - owner = "MirBSD"; - repo = pname; - rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck="; - }; - - postPatch = '' - substituteInPlace GNUmakefile \ - --replace -I/usr/include/KF5/KCoreAddons -I${kcoreaddons.dev}/include/KF5/KCoreAddons \ - --replace -I/usr/include/KF5/KI18n -I${ki18n.dev}/include/KF5/KI18n \ - --replace -I/usr/include/KF5/KWallet -I${kwallet.dev}/include/KF5/KWallet \ - --replace /usr/bin $out/bin \ - --replace /usr/share/man $out/share/man - - substituteInPlace pinentry-kwallet \ - --replace '/usr/bin/env mksh' ${mksh}/bin/mksh - - substituteInPlace kwalletcli_getpin \ - --replace '/usr/bin/env mksh' ${mksh}/bin/mksh - ''; - - makeFlags = [ "KDE_VER=5" ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - wrapQtAppsHook - ]; - # if using just kwallet, cmake will be added as a buildInput and fail the build - propagatedBuildInputs = [ - kcoreaddons - ki18n - (lib.getLib kwallet) - ]; - - preInstall = '' - mkdir -p $out/bin $out/share/man/man1 - ''; - - postInstall = '' - for program in pinentry-kwallet kwalletcli_getpin; do - wrapProgram $out/bin/$program \ - --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ - --set-default PINENTRY pinentry-qt - done - ''; - - meta = { - description = "Command-Line Interface to the KDE Wallet"; - homepage = "https://www.mirbsd.org/kwalletcli.htm"; - license = lib.licenses.miros; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48cbec9991e6..332b66fac6ea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -29,178 +29,172 @@ let else alias; - deprecatedPlasma5Packages = { - inherit (plasma5Packages) - akonadi-calendar - akonadi-calendar-tools - akonadi-contacts - akonadi-import-wizard - akonadi-mime - akonadi-notes - akonadi-search - akonadiconsole - alligator - analitza - angelfish - applet-window-appmenu - applet-window-buttons - audiotube - aura-browser - baloo-widgets - bismuth - booth - buho - calendarsupport - calindori - cantor - clip - communicator - dolphin-plugins - eventviews - flatpak-kcm - ghostwriter - grantleetheme - incidenceeditor - index - isoimagewriter - juk - kaccounts-integration - kaccounts-providers - kalarm - kalgebra - kalk - kamoso - kasts - kbreakout - kcalutils - kclock - kde-inotify-survey - kde2-decoration - kdebugsettings - kdeconnect-kde - kdecoration - kdegraphics-mobipocket - kdegraphics-thumbnailers - kdenetwork-filesharing - kdepim-runtime - keysmith - kgeography - khotkeys - kidentitymanagement - kimap - kio-admin - kio-extras - kio-gdrive - kipi-plugins - kirigami-gallery - kldap - kmahjongg - kmail-account-wizard - kmailtransport - kmbox - kmime - kmousetool - knotes - koko - kolf - kongress - konqueror - konquest - kontactinterface - kopeninghours - kosmindoormap - kpat - kpimtextedit - kpipewire - kpmcore - kpublictransport - kqtquickcharts - krecorder - kreport - kruler - ksanecore - ksmtp - kspaceduel - ksudoku - ksystemstats - ktnef - ktrip - kweather - kzones - layer-shell-qt - libgravatar - libkcddb - libkdcraw - libkdegames - libkdepim - libkexiv2 - libkgapi - libkipi - libkleo - libkmahjongg - libkomparediff2 - libksane - libkscreen - libksieve - libksysguard - libktorrent - lightly - mailcommon - mailimporter - mauikit - mauikit-accounts - mauikit-calendar - mauikit-documents - mauikit-filebrowsing - mauikit-imagetools - mauikit-terminal - mauikit-texteditor - mauiman - mbox-importer - messagelib - oxygen-sounds - palapeli - parachute - partitionmanager - pim-data-exporter - pim-sieve-editor - pimcommon - plank-player - plasma-bigscreen - plasma-dialer - plasma-disks - plasma-firewall - plasma-phonebook - plasma-remotecontrollers - plasma-sdk - plasma-settings - plasma-welcome - plasmatube - polkit-kde-agent - print-manager - qmlkonsole - rocs - shelf - sierra-breeze-enhanced - soundkonverter - station - telly-skout - tokodon - umbrello - vvave - xwaylandvideobridge - ; - - inherit (libsForQt5) - neochat # Added 2025-07-04 - itinerary # Added 2025-07-04 - libquotient # Added 2025-07-04 - qtwebengine # Added 2026-01-15 - qtwebview # Added 2026-04-03 - ; - - kexi = throw ""; # Added 2025-08-21 - }; + deprecatedPlasma5Packages = [ + "akonadi-calendar" + "akonadi-calendar-tools" + "akonadi-contacts" + "akonadi-import-wizard" + "akonadi-mime" + "akonadi-notes" + "akonadi-search" + "akonadiconsole" + "alligator" + "analitza" + "angelfish" + "applet-window-appmenu" + "applet-window-buttons" + "audiotube" + "aura-browser" + "baloo-widgets" + "bismuth" + "booth" + "buho" + "calendarsupport" + "calindori" + "cantor" + "clip" + "communicator" + "dolphin-plugins" + "eventviews" + "flatpak-kcm" + "ghostwriter" + "grantleetheme" + "incidenceeditor" + "index" + "isoimagewriter" + "juk" + "kaccounts-integration" + "kaccounts-providers" + "kalarm" + "kalgebra" + "kalk" + "kamoso" + "kasts" + "kbreakout" + "kcalutils" + "kclock" + "kde-inotify-survey" + "kde2-decoration" + "kdebugsettings" + "kdeconnect-kde" + "kdecoration" + "kdegraphics-mobipocket" + "kdegraphics-thumbnailers" + "kdenetwork-filesharing" + "kdepim-runtime" + "keysmith" + "kgeography" + "khotkeys" + "kidentitymanagement" + "kimap" + "kio-admin" + "kio-extras" + "kio-gdrive" + "kipi-plugins" + "kirigami-gallery" + "kldap" + "kmahjongg" + "kmail-account-wizard" + "kmailtransport" + "kmbox" + "kmime" + "kmousetool" + "knotes" + "koko" + "kolf" + "kongress" + "konqueror" + "konquest" + "kontactinterface" + "kopeninghours" + "kosmindoormap" + "kpat" + "kpimtextedit" + "kpipewire" + "kpmcore" + "kpublictransport" + "kqtquickcharts" + "krecorder" + "kreport" + "kruler" + "ksanecore" + "ksmtp" + "kspaceduel" + "ksudoku" + "ksystemstats" + "ktnef" + "ktrip" + "kweather" + "kzones" + "layer-shell-qt" + "libgravatar" + "libkcddb" + "libkdcraw" + "libkdegames" + "libkdepim" + "libkexiv2" + "libkgapi" + "libkipi" + "libkleo" + "libkmahjongg" + "libkomparediff2" + "libksane" + "libkscreen" + "libksieve" + "libksysguard" + "libktorrent" + "lightly" + "mailcommon" + "mailimporter" + "mauikit" + "mauikit-accounts" + "mauikit-calendar" + "mauikit-documents" + "mauikit-filebrowsing" + "mauikit-imagetools" + "mauikit-terminal" + "mauikit-texteditor" + "mauiman" + "mbox-importer" + "messagelib" + "oxygen-sounds" + "palapeli" + "parachute" + "partitionmanager" + "pim-data-exporter" + "pim-sieve-editor" + "pimcommon" + "plank-player" + "plasma-bigscreen" + "plasma-dialer" + "plasma-disks" + "plasma-firewall" + "plasma-phonebook" + "plasma-remotecontrollers" + "plasma-sdk" + "plasma-settings" + "plasma-welcome" + "plasmatube" + "polkit-kde-agent" + "print-manager" + "qmlkonsole" + "rocs" + "shelf" + "sierra-breeze-enhanced" + "soundkonverter" + "station" + "telly-skout" + "tokodon" + "umbrello" + "vvave" + "xwaylandvideobridge" + "neochat" # Added 2025-07-04 + "itinerary" # Added 2025-07-04 + "libquotient" # Added 2025-07-04 + "kexi" # Added 2025-08-21 + "qtwebengine" # Added 2026-01-15 + "qtwebview" # Added 2026-04-03 + ]; makePlasma5Throw = name: @@ -221,7 +215,7 @@ let mapAliases = aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases; - plasma5Throws = mapAliases (lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages); + plasma5Throws = mapAliases (lib.genAttrs deprecatedPlasma5Packages makePlasma5Throw); warnAlias = msg: v: @@ -371,6 +365,7 @@ mapAliases { bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20 bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20 + bcompare4 = throw "'bcompare4' has been removed due to outdated KF5 dependencies"; # Added 2025-05-01 bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20 bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20 beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16 @@ -592,6 +587,7 @@ mapAliases { cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21 + darkly-qt5 = throw "'darkly-qt' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21 dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25 @@ -642,6 +638,7 @@ mapAliases { dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27 dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13 e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 + e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26 eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27 easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 @@ -693,6 +690,7 @@ mapAliases { eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 + fancontrol-gui = throw "'fancontrol-gui' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17 fastJson = warnAlias "'fastJson' has been renamed to 'libfastjson'" libfastjson; # Added 2026-02-08 fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27 @@ -1007,6 +1005,8 @@ mapAliases { k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 k3s_1_32 = throw "'k3s_1_32' has been removed from nixpkgs as it has reached end of life"; # Added 2026-03-31 + k4dirstat = throw "'k4dirstat' has been removed due to outdated KF5 dependencies; consider using 'qdirstat' instead."; # Added 2026-05-01 + kaffeine = throw "'kaffeine' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27 kanidm = throw "'kanidm' alias has been removed. You must use a versioned package, e.g. 'kanidm_1_x'."; # Added 2026-01-29 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 @@ -1023,11 +1023,14 @@ mapAliases { kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10 kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17 + kdesvn = throw "'kdesvn' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27 keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08 + kgraphviewer = throw "'kgraphviewer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27 khd = throw "'khd' has been removed as it has been pulled upstream"; # Added 2025-12-18 khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 + kio-fuse = throw "'kio-fuse' has been removed, as Plasma 5 has reached end of life. Use 'kdePackages.kio-fuse' for Plasma 6."; # Added 2026-05-01 kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30 kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27 @@ -1037,9 +1040,13 @@ mapAliases { krb5Full = throw "'krb5Full' has been renamed to/replaced by 'krb5'"; # Converted to throw 2025-10-27 krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 + ksmoothdock = throw "'ksmoothdock' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 + ktextaddons = throw "'ktextaddons' has been removed due to outdated KF5 dependencies. A Qt6 version is available at 'kdePackages.ktextaddons'."; # Added 2026-05-01 kube3d = throw "'kube3d' has been renamed to/replaced by 'k3d'"; # Converted to throw 2025-10-27 kubei = throw "'kubei' has been renamed to/replaced by 'kubeclarity'"; # Converted to throw 2025-10-27 kubo-migrator-all-fs-repo-migrations = throw "'kubo-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27 + kup = throw "'kup' has been removed due to outdated KF5 dependencies. A Qt6 version is available at 'kdePackages.kup'."; # Added 2026-05-01 + kwalletcli = throw "'kwalletcli' has been removed, as Plasma 5 has reached end of life"; # Added 2026-05-01 kwm = throw "'kwm' has been removed since upstream is a 404"; # Added 2025-12-21 ladspaH = warnAlias "'ladspaH' has been renamed to 'ladspa-header'" ladspa-header; # Added 2026-02-08 languageMachines.frog = frog; # Added 2025-10-7 @@ -1348,6 +1355,7 @@ mapAliases { magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 magpie = throw "'magpie' has been removed, no longer used by budgie-desktop."; # Added 2025-11-19 + maia-icon-theme = throw "'maia-icon-theme' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12 mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12 @@ -1359,6 +1367,7 @@ mapAliases { marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27 marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27 marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27 + massif-visualizer = throw "'massif-visualizer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07 material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09 @@ -1669,6 +1678,7 @@ mapAliases { pinecone = throw "'pinecone' has been removed, as it is unmaintained and obsolete"; # Added 2026-03-31 pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26 pingvin-share = throw "'pingvin-share' has been removed as it was broken and archived upstream"; # Added 2025-11-08 + pipecontrol = throw "'pipecontrol' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03 plant-it = throw "plant-it backend was discontinued in september 2025"; # Added 2026-01-30 plant-it-frontend = throw "plant-it-frontend has been presented as being Android-only since the server-side was discontinued in september 2025"; # Added 2026-01-30 @@ -1677,6 +1687,7 @@ mapAliases { plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04 platformioPackages.platformio-core = platformio-core; # Added 2025-09-04 + playbar2 = throw "'playbar2' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28 PlistCpp = throw "'PlistCpp' has been renamed to/replaced by 'plistcpp'"; # Converted to throw 2025-10-27 pltScheme = throw "'pltScheme' has been renamed to/replaced by 'racket'"; # Converted to throw 2025-10-27 @@ -1686,6 +1697,7 @@ mapAliases { pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27 podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 + polonium = throw "'polonium' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27 popura = throw "'popura' is abandoned upstream and in nixpkgs and has been removed"; # Added 2026-01-15 @@ -2061,6 +2073,7 @@ mapAliases { tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27 tooling-language-server = deputy; # Added 2025-06-22 tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27 + tora = throw "'tora' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 tracker = throw "'tracker' has been renamed to/replaced by 'tinysparql'"; # Converted to throw 2025-10-27 tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27 transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04af46a5ff5..ae67292ec8e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2617,8 +2617,6 @@ with pkgs; }; kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; - kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; - keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; keybase = callPackage ../tools/security/keybase { }; @@ -2633,11 +2631,7 @@ with pkgs; inherit (darwin) sigtool; }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; - - kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + kronometer = kdePackages.callPackage ../tools/misc/kronometer { }; limine-full = limine.override { enableAll = true; }; @@ -3251,7 +3245,7 @@ with pkgs; lua = lua5_4; }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = kdePackages.callPackage ../applications/misc/rsibreak { }; rubocop = rubyPackages.rubocop; @@ -5540,9 +5534,6 @@ with pkgs; ]; }; - # Does not actually depend on Qt 5 - inherit (plasma5Packages) extra-cmake-modules; - coccinelle = callPackage ../development/tools/misc/coccinelle { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -5704,8 +5695,6 @@ with pkgs; lit = with python3Packages; toPythonApplication lit; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; - maven3 = maven; inherit (maven) buildMaven; @@ -7148,9 +7137,6 @@ with pkgs; } ); - # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop - plasma5Packages = libsForQt5; - qtEnv = qt5.env; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); @@ -9657,9 +9643,7 @@ with pkgs; ; k3s = k3s_1_35; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; - - k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + okteta = kdePackages.callPackage ../applications/editors/okteta { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -9710,8 +9694,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - kup = libsForQt5.callPackage ../applications/misc/kup { }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { @@ -9807,7 +9789,7 @@ with pkgs; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = kdePackages.callPackage ../applications/video/minitube { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { ocamlPackages = ocaml-ng.ocamlPackages_4_14; @@ -10106,13 +10088,12 @@ with pkgs; quasselClient = quassel.override { monolithic = false; client = true; - tag = "-client-kf5"; + tag = "-client-qt5"; }; quasselDaemon = quassel.override { monolithic = false; enableDaemon = true; - withKDE = false; tag = "-daemon-qt5"; }; @@ -11294,7 +11275,7 @@ with pkgs; blas-ilp64 = blas.override { isILP64 = true; }; - labplot = libsForQt5.callPackage ../applications/science/math/labplot { }; + labplot = kdePackages.callPackage ../applications/science/math/labplot { }; lapack-ilp64 = lapack.override { isILP64 = true; }; @@ -12077,8 +12058,6 @@ with pkgs; discord-development ; - tora = libsForQt5.callPackage ../development/tools/tora { }; - torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 63b241312cfe..6e753238312f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -35,7 +35,7 @@ makeScopeWithSplicing' { attrs = { inherit config; inherit libsForQt5; - inherit (pkgs) lib fetchurl; + inherit (pkgs) lib fetchurl kdePackages; }; in (lib.makeOverridable mkFrameworks attrs); @@ -51,15 +51,15 @@ makeScopeWithSplicing' { in (noExtraAttrs ( - kdeFrameworks - // qt5 + qt5 // { inherit - kdeFrameworks qt5 ; + __internalKF5 = lib.dontRecurseIntoAttrs kdeFrameworks; + ### LIBRARIES accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { }; @@ -72,34 +72,18 @@ makeScopeWithSplicing' { fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; - futuresql = callPackage ../development/libraries/futuresql { }; - qgpgme = callPackage ../development/libraries/qgpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; - qtcurve = callPackage ../data/themes/qtcurve { }; - herqq = callPackage ../development/libraries/herqq { }; - kdb = callPackage ../development/libraries/kdb { }; - kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; - kdiagram = callPackage ../development/libraries/kdiagram { }; - kdsoap = callPackage ../development/libraries/kdsoap { }; - kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; - kimageannotator = callPackage ../development/libraries/kimageannotator { }; - kproperty = callPackage ../development/libraries/kproperty { }; - - kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { }; - - kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; - ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -122,26 +106,14 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; - libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; - maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = pkgs.mlt.override { qt = qt5; }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; - - plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { @@ -150,8 +122,6 @@ makeScopeWithSplicing' { suffix = "qt5"; }; - pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - pyotherside = callPackage ../development/libraries/pyotherside { }; qca = callPackage ../development/libraries/qca { @@ -226,12 +196,27 @@ makeScopeWithSplicing' { xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; } // lib.optionalAttrs config.allowAliases { + futuresql = throw "libsForQt5.futuresql has been removed"; # Added 2026-05-01 + kdb = throw "libsForQt5.kdb has been removed"; # Added 2026-05-01 + kdiagram = throw "libsForQt5.kdiagram has been removed"; # Added 2026-05-01 kf5gpgmepp = throw '' 'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017. Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead. ''; # Added 2025-10-25 + kirigami-addons = throw "libsForQt5.kirigami-addons has been removed"; # Added 2026-05-01 + kproperty = throw "libsForQt5.kproperty has been removed"; # Added 2026-05-01 + kquickimageedit = throw "libsForQt5.kquickimageedit has been removed"; # Added 2026-05-01 + ktextaddons = throw "libsForQt5.ktextaddons has been removed"; # Added 2026-05-01 + kuserfeedback = throw "libsForQt5.kuserfeedback has been removed"; # Added 2026-05-01 + libqaccessibilityclient = throw "libsForQt5.libqaccessibilityclient has been removed"; # Added 2026-05-01 mapbox-gl-native = throw "libsForQt5.mapbox-gl-native has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 maplibre-gl-native = throw "libsForQt5.maplibre-gl-native has been removed due to being broken and superseded by maplibre-native-qt"; # Added 2026-04-11 + maui-core = throw "libsForQt5.maui-core has been removed"; # Added 2026-05-01 + phonon = throw "libsForQt5.phonon has been removed"; # Added 2026-05-01 + phonon-backend-gstreamer = throw "libsForQt5.phonon-backend-gstreamer has been removed"; # Added 2026-05-01 + phonon-backend-vlc = throw "libsForQt5.phonon-backend-vlc has been removed"; # Added 2026-05-01 + plasma-wayland-protocols = throw "libsForQt5.plasma-wayland-protocols has been removed"; # Added 2026-05-01 + pulseaudio-qt = throw "libsForQt5.pulseaudio-qt has been removed"; } )) );