treewide: drop now-unused KF5 and Qt5 libraries

This commit is contained in:
K900
2026-05-08 09:34:21 +03:00
parent d026e28a94
commit e12830446f
86 changed files with 212 additions and 1570 deletions
-40
View File
@@ -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 = [ ];
};
})
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
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;
@@ -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 ];
};
}
@@ -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"
@@ -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
];
@@ -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";
@@ -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;
};
}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
bzip2,
xz,
@@ -12,6 +13,7 @@
mkDerivation {
pname = "karchive";
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
];
@@ -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 = [
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
qttools,
kcodecs,
@@ -15,6 +16,7 @@
mkDerivation {
pname = "kbookmarks";
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
];
@@ -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"
@@ -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
];
}
@@ -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
@@ -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
@@ -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 ];
}
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
kauth,
kcodecs,
@@ -15,6 +16,7 @@
mkDerivation {
pname = "kconfigwidgets";
nativeBuildInputs = [
cmake
extra-cmake-modules
kdoctools
];
@@ -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
@@ -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
@@ -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
@@ -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
];
}
@@ -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
@@ -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"
];
}
@@ -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':
@@ -1 +0,0 @@
export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required!
@@ -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 ];
}
@@ -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
@@ -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
@@ -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
];
}
@@ -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
@@ -2,6 +2,8 @@
lib,
stdenv,
mkDerivation,
cmake,
pkg-config,
extra-cmake-modules,
wayland-scanner,
qtbase,
@@ -14,6 +16,8 @@ mkDerivation {
pname = "kguiaddons";
nativeBuildInputs = [
cmake
pkg-config
extra-cmake-modules
]
++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -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
@@ -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
@@ -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 ];
}
@@ -1,25 +0,0 @@
From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
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 <string.h>
#include <unistd.h>
-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
#if KDEINIT_OOM_PROTECT
--
2.23.1
@@ -1,59 +0,0 @@
From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
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
@@ -1,29 +0,0 @@
From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
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
@@ -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)
'';
}
@@ -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
];
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
qtbase,
qtquickcontrols2,
@@ -10,6 +11,7 @@
mkDerivation {
pname = "kirigami2";
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
];
@@ -1,15 +0,0 @@
{
mkDerivation,
extra-cmake-modules,
qtbase,
}:
mkDerivation {
pname = "kitemmodels";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
outputs = [
"out"
"dev"
];
}
@@ -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 = [
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
qttools,
kcoreaddons,
@@ -10,6 +11,7 @@
mkDerivation {
pname = "kjobwidgets";
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
];
@@ -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
@@ -2,6 +2,7 @@
mkDerivation,
lib,
stdenv,
cmake,
extra-cmake-modules,
kcodecs,
kconfig,
@@ -17,6 +18,7 @@
mkDerivation {
pname = "knotifications";
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
];
@@ -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"
];
}
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
kdoctools,
karchive,
@@ -12,6 +13,7 @@
mkDerivation {
pname = "kpackage";
nativeBuildInputs = [
cmake
extra-cmake-modules
kdoctools
];
@@ -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
];
}
@@ -1,19 +0,0 @@
{
mkDerivation,
extra-cmake-modules,
qttools,
qtbase,
}:
mkDerivation {
pname = "kplotting";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
qtbase
qttools
];
outputs = [
"out"
"dev"
];
}
@@ -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
@@ -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
];
@@ -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
@@ -1,19 +0,0 @@
{
mkDerivation,
extra-cmake-modules,
ki18n,
qtbase,
}:
mkDerivation {
pname = "kunitconversion";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
ki18n
qtbase
];
outputs = [
"out"
"dev"
];
}
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
kdoctools,
kconfig,
@@ -21,6 +22,7 @@
mkDerivation {
pname = "kwallet";
nativeBuildInputs = [
cmake
extra-cmake-modules
kdoctools
];
@@ -1,7 +1,8 @@
{
mkDerivation,
propagateBin,
lib,
cmake,
pkg-config,
extra-cmake-modules,
wayland-scanner,
kdePackages,
@@ -22,6 +23,8 @@ mkDerivation {
];
nativeBuildInputs = [
cmake
pkg-config
extra-cmake-modules
wayland-scanner
];
@@ -31,6 +34,9 @@ mkDerivation {
wayland-protocols
];
propagatedBuildInputs = [ qtbase ];
setupHook = propagateBin; # XDG_CONFIG_DIRS
outputs = [
"out"
"dev"
];
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
}
@@ -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 = [
@@ -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
@@ -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
@@ -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
];
}
@@ -1,5 +1,6 @@
{
mkDerivation,
cmake,
extra-cmake-modules,
intltool,
qtbase,
@@ -16,6 +17,7 @@
mkDerivation {
pname = "purpose";
nativeBuildInputs = [
cmake
extra-cmake-modules
intltool
];
@@ -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
]
@@ -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
@@ -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"
];
}
@@ -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
];
@@ -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"
@@ -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
@@ -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 ];
};
}
@@ -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 ];
};
}
@@ -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) # Dont 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)
@@ -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 ];
};
}
@@ -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;
};
}
@@ -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";
};
}
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
kdePackages.extra-cmake-modules
];
buildInputs = [ qtbase ];
cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ];
cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ];
outputs = [
"out"
@@ -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;
};
}
@@ -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<char**>(args);
GError *err = 0;
@@ -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;
};
}
@@ -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
];
};
}
@@ -1,98 +0,0 @@
{
stdenv,
lib,
fetchurl,
cmake,
libGLU,
libGL,
pkg-config,
libpulseaudio,
kdePackages,
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
kdePackages.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"
'';
}
@@ -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 ];
};
}
@@ -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 ];
};
})
+1
View File
@@ -1041,6 +1041,7 @@ mapAliases {
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
-3
View File
@@ -5534,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;
};
+16 -29
View File
@@ -35,7 +35,7 @@ makeScopeWithSplicing' {
attrs = {
inherit config;
inherit libsForQt5;
inherit (pkgs) lib fetchurl;
inherit (pkgs) lib fetchurl kdePackages;
};
in
(lib.makeOverridable mkFrameworks attrs);
@@ -72,32 +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 { };
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 { };
@@ -120,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 {
@@ -148,8 +122,6 @@ makeScopeWithSplicing' {
suffix = "qt5";
};
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
pyotherside = callPackage ../development/libraries/pyotherside { };
qca = callPackage ../development/libraries/qca {
@@ -224,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";
}
))
);