public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117947 from ttuegel/update-kde 

KDE Frameworks 5.80 and Applications 20.12.3
This commit is contained in:
Thomas Tuegel 2021-04-07 14:35:49 -05:00 committed by GitHub
parent f1e22d45f0 e1aa8a713b
commit e4d788f8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
117 changed files with 1501 additions and 1592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.3/src -A '*.tar.xz' )

1792
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/desktops/plasma-5/bluedevil.nix
View File

@ -13,5 +13,4 @@ mkDerivation {
ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
kiconthemes knotifications kwidgetsaddons
];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

24
pkgs/desktops/plasma-5/default.nix
View File

@ -30,6 +30,13 @@ existing packages here and modify it as necessary.
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
srcs = import ./srcs.nix {
inherit fetchurl;
mirror = "mirror://kde";
@ -81,14 +88,15 @@ let
defaultSetupHook = if hasBin && hasDev then propagateBin else null;
setupHook = args.setupHook or defaultSetupHook;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
homepage = "http://www.kde.org";
} // (args.meta or {});
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "http://www.kde.org";
license = meta.license or license;
maintainers = (meta.maintainers or []) ++ maintainers;
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
in
mkDerivation (args // {
name = "${name}-${version}";

1
pkgs/desktops/plasma-5/discover.nix
View File

@ -33,7 +33,6 @@
mkDerivation {
name = "discover";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ];
buildInputs = [
# discount is needed for libmarkdown

1
pkgs/desktops/plasma-5/kactivitymanagerd.nix
View File

@ -7,7 +7,6 @@
mkDerivation {
name = "kactivitymanagerd";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem

1
pkgs/desktops/plasma-5/kdecoration.nix
View File

@ -5,5 +5,4 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/kgamma5.nix
View File

@ -8,5 +8,4 @@ mkDerivation {
name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
meta.broken = lib.versionOlder qtbase.version "5.15";
}

1
pkgs/desktops/plasma-5/khotkeys.nix
View File

@ -14,5 +14,4 @@ mkDerivation {
plasma-framework plasma-workspace qtx11extras
];
outputs = [ "bin" "dev" "out" ];
meta.broken = lib.versionOlder qtbase.version "5.14";
}

1
pkgs/desktops/plasma-5/kinfocenter.nix
View File

@ -10,7 +10,6 @@
mkDerivation {
name = "kinfocenter";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons

1
pkgs/desktops/plasma-5/kscreenlocker.nix
View File

@ -8,7 +8,6 @@
mkDerivation {
name = "kscreenlocker";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland

1
pkgs/desktops/plasma-5/ksshaskpass.nix
View File

@ -8,5 +8,4 @@ mkDerivation {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/ksysguard.nix
View File

@ -9,7 +9,6 @@
mkDerivation {
name = "ksysguard";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard

1
pkgs/desktops/plasma-5/kwayland-integration.nix
View File

@ -8,5 +8,4 @@ mkDerivation {
name = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/kwayland-server/default.nix
View File

@ -15,5 +15,4 @@ mkDerivation {
kwayland plasma-wayland-protocols wayland wayland-protocols
];
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/kwrited.nix
View File

@ -8,5 +8,4 @@ mkDerivation {
name = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

3
pkgs/desktops/plasma-5/libkscreen/default.nix
View File

@ -6,9 +6,6 @@
mkDerivation {
name = "libkscreen";
meta = {
broken = lib.versionOlder qtbase.version "5.15.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kwayland libXrandr qtx11extras ];
outputs = [ "out" "dev" ];

1
pkgs/desktops/plasma-5/libksysguard/default.nix
View File

@ -8,7 +8,6 @@
mkDerivation {
name = "libksysguard";
meta.broken = lib.versionOlder qtbase.version "5.14.0";
patches = [
./0001-qdiriterator-follow-symlinks.patch
];

1
pkgs/desktops/plasma-5/milou.nix
View File

@ -7,7 +7,6 @@
mkDerivation {
name = "milou";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework

1
pkgs/desktops/plasma-5/plasma-nm/default.nix
View File

@ -11,7 +11,6 @@
mkDerivation {
name = "plasma-nm";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework

1
pkgs/desktops/plasma-5/plasma-pa.nix
View File

@ -17,5 +17,4 @@ mkDerivation {
qtbase qtdeclarative
];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/plasma-systemmonitor.nix
View File

@ -16,7 +16,6 @@
mkDerivation {
name = "plasma-systemmonitor";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtquickcontrols2

1
pkgs/desktops/plasma-5/polkit-kde-agent.nix
View File

@ -12,5 +12,4 @@ mkDerivation {
knotifications kwindowsystem polkit-qt
];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

1
pkgs/desktops/plasma-5/sddm-kcm.nix
View File

@ -18,7 +18,6 @@
mkDerivation {
name = "sddm-kcm";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
libpthreadstubs

1
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
View File

@ -9,7 +9,6 @@
mkDerivation {
name = "xdg-desktop-portal-kde";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
buildInputs = [
cups epoxy mesa pcre pipewire wayland wayland-protocols

6
pkgs/development/libraries/kde-frameworks/attica.nix
View File

@ -1,11 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase }:
{ mkDerivation, extra-cmake-modules, qtbase }:
mkDerivation {
name = "attica";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/kde-frameworks/baloo.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
@ -7,7 +7,6 @@
mkDerivation {
name = "baloo";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative

6
pkgs/development/libraries/kde-frameworks/bluez-qt.nix
View File

@ -1,14 +1,10 @@
{ mkDerivation, lib
{ mkDerivation
, extra-cmake-modules
, qtbase, qtdeclarative
}:
mkDerivation {
name = "bluez-qt";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtdeclarative ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/breeze-icons.nix
View File

@ -1,8 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }:
{ mkDerivation, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }:
mkDerivation {
name = "breeze-icons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules gtk3 ];
buildInputs = [ qtsvg ];
propagatedBuildInputs = [

26
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -28,6 +28,13 @@ existing packages here and modify it as necessary.
let
minQtVersion = "5.14";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
srcs = import ./srcs.nix {
inherit fetchurl;
mirror = "mirror://kde";
@ -72,14 +79,15 @@ let
defaultSetupHook = if hasSeparateDev then propagateBin else null;
setupHook = args.setupHook or defaultSetupHook;
meta = {
homepage = "http://www.kde.org";
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
platforms = lib.platforms.linux;
} // (args.meta or {});
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "http://www.kde.org";
license = meta.license or license;
maintainers = (meta.maintainers or []) ++ maintainers;
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
in mkDerivation (args // {
name = "${name}-${version}";
@ -158,7 +166,7 @@ let
kiconthemes = callPackage ./kiconthemes {};
kinit = callPackage ./kinit {};
kio = callPackage ./kio {};
knewstuff = callPackage ./knewstuff.nix {};
knewstuff = callPackage ./knewstuff {};
knotifyconfig = callPackage ./knotifyconfig.nix {};
kparts = callPackage ./kparts.nix {};
kpeople = callPackage ./kpeople.nix {};

1
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
View File

@ -17,6 +17,5 @@ mkDerivation {
platforms = platforms.linux ++ platforms.darwin;
homepage = "http://www.kde.org";
license = licenses.bsd2;
maintainers = [ maintainers.ttuegel ];
};
}

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.80/ -A '*.tar.xz' )

3
pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
@ -7,7 +7,6 @@
mkDerivation {
name = "frameworkintegration";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage

3
pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
boost, kactivities, kconfig, qtbase,
}:
mkDerivation {
name = "kactivities-stats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ boost kactivities kconfig ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kactivities.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
}:
mkDerivation {
name = "kactivities";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kio kwindowsystem qtdeclarative

1
pkgs/development/libraries/kde-frameworks/kapidox.nix
View File

@ -2,7 +2,6 @@
mkDerivation {
name = "kapidox";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
postFixup = ''
moveToOutput bin $bin

6
pkgs/development/libraries/kde-frameworks/karchive.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
bzip2, xz, qtbase, zlib,
}:
mkDerivation {
name = "karchive";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ bzip2 xz zlib ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kauth/default.nix
View File

@ -1,11 +1,10 @@
{
mkDerivation, lib, propagate,
mkDerivation, propagate,
extra-cmake-modules, kcoreaddons, polkit-qt, qttools
}:
mkDerivation {
name = "kauth";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ polkit-qt qttools ];
propagatedBuildInputs = [ kcoreaddons ];

3
pkgs/development/libraries/kde-frameworks/kbookmarks.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, qttools,
kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
kxmlgui, qtbase,
@ -7,7 +7,6 @@
mkDerivation {
name = "kbookmarks";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui

7
pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
View File

@ -1,15 +1,12 @@
{
mkDerivation,
lib,
extra-cmake-modules,
libical
libical,
qtbase
}:
mkDerivation {
name = "kcalendarcore";
meta = {
maintainers = [ lib.maintainers.nyanloutre ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ libical ];
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
kpackage, kservice, kxmlgui, qtdeclarative,
@ -7,7 +7,6 @@
mkDerivation {
name = "kcmutils";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui

6
pkgs/development/libraries/kde-frameworks/kcodecs.nix
View File

@ -1,11 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, gperf }:
{ mkDerivation, extra-cmake-modules, qtbase, qttools, gperf }:
mkDerivation {
name = "kcodecs";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools gperf ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kcompletion.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kconfig, kwidgetsaddons, qtbase, qttools
}:
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];

6
pkgs/development/libraries/kde-frameworks/kconfig.nix
View File

@ -1,11 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
{ mkDerivation, extra-cmake-modules, qtbase, qttools }:
mkDerivation {
name = "kconfig";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];

21
pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch
View File

@ -1,8 +1,17 @@
From 05c0eb5d803ac52c0dd97a98f6d2821650c3c14c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 06:09:47 -0500
Subject: [PATCH] QDirIterator follow symlinks
---
src/khelpclient.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index fbbc0fa..cb78741 100644
index a053cd7..787d375 100644
--- a/src/khelpclient.cpp
+++ b/src/khelpclient.cpp
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
@@ -34,7 +34,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
QString docPath;
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
for (const QString &dir : desktopDirs) {
@ -11,8 +20,6 @@ index fbbc0fa..cb78741 100644
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);
@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
// launch khelpcenter, or a browser for URIs not handled by khelpcenter
QDesktopServices::openUrl(url);
}
-
--
2.30.1

5
pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
View File

@ -1,15 +1,14 @@
{
mkDerivation, lib, extra-cmake-modules,
mkDerivation, extra-cmake-modules,
kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qttools, qtbase,
}:
mkDerivation {
name = "kconfigwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kguiaddons ki18n qtbase qttools ];
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
patches = [ ./0001-QDirIterator-follow-symlinks.patch ];
outputs = [ "out" "dev" ];
outputBin = "dev";
postInstall = ''

6
pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
qtbase, qttools, shared-mime-info
}:
mkDerivation {
name = "kcoreaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared-mime-info ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kcrash.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kcoreaddons, kwindowsystem, qtbase, qtx11extras,
}:
mkDerivation {
name = "kcrash";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
propagatedBuildInputs = [ qtbase ];

6
pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
qtbase, qttools, qtx11extras
}:
mkDerivation {
name = "kdbusaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kdeclarative.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib, extra-cmake-modules,
mkDerivation, extra-cmake-modules,
epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
kwidgetsaddons, kwindowsystem, qtdeclarative
}:
mkDerivation {
name = "kdeclarative";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons

3
pkgs/development/libraries/kde-frameworks/kded.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, propagate, wrapGAppsHook,
mkDerivation, propagate, wrapGAppsHook,
extra-cmake-modules, kdoctools,
gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit,
kservice, qtbase,
@ -7,7 +7,6 @@
mkDerivation {
name = "kded";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit

3
pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
@ -10,7 +10,6 @@
mkDerivation {
name = "kdelibs4support";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = [
./nix-kde-include-dir.patch
];

3
pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
@ -7,7 +7,6 @@
mkDerivation {
name = "kdesignerplugin";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews

3
pkgs/development/libraries/kde-frameworks/kdesu/default.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kcoreaddons, ki18n, kpty, kservice, qtbase,
}:
mkDerivation {
name = "kdesu";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
propagatedBuildInputs = [ kpty ];

6
pkgs/development/libraries/kde-frameworks/kdnssd.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
avahi, qtbase, qttools,
}:
mkDerivation {
name = "kdnssd";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ avahi qttools ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
karchive, ki18n, qtbase,
perl, perlPackages
@ -7,7 +7,6 @@
mkDerivation {
name = "kdoctools";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [
extra-cmake-modules
# The build system insists on having native Perl.

3
pkgs/development/libraries/kde-frameworks/kemoticons.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
karchive, kcoreaddons, kservice, qtbase,
}:
mkDerivation {
name = "kemoticons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kcoreaddons ];
propagatedBuildInputs = [ kservice qtbase ];

3
pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
}:
mkDerivation {
name = "kfilemetadata";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia

3
pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtbase, qttools, qtx11extras, libXdmcp,
@ -7,7 +7,6 @@
mkDerivation {
name = "kglobalaccel";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools

7
pkgs/development/libraries/kde-frameworks/kguiaddons.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib
{ mkDerivation
, extra-cmake-modules
, qtbase, qtx11extras, wayland
}:
@ -11,9 +11,4 @@ mkDerivation {
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
meta = with lib; {
maintainers = [ maintainers.ttuegel ];
broken = versionOlder qtbase.version "5.14.0";
};
}

3
pkgs/development/libraries/kde-frameworks/khtml.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, perl,
giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs,
knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem,
@ -8,7 +8,6 @@
mkDerivation {
name = "khtml";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [
giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications

6
pkgs/development/libraries/kde-frameworks/ki18n.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, gettext, python3,
qtbase, qtdeclarative, qtscript,
}:
mkDerivation {
name = "ki18n";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python3 ];
buildInputs = [ qtdeclarative qtscript ];

3
pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
qtbase, qtsvg, qttools,
@ -7,7 +7,6 @@
mkDerivation {
name = "kiconthemes";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = [
./default-theme-breeze.patch
];

6
pkgs/development/libraries/kde-frameworks/kidletime.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
qtbase, qtx11extras
}:
mkDerivation {
name = "kidletime";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras ];
propagatedBuildInputs = [ qtbase ];

1
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View File

@ -8,7 +8,6 @@ let inherit (lib) getDev; in
mkDerivation {
name = "kimageformats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive openexr qtbase ];
outputs = [ "out" ]; # plugins only

1
pkgs/development/libraries/kde-frameworks/kinit/default.nix
View File

@ -8,7 +8,6 @@ let inherit (lib) getLib; in
mkDerivation {
name = "kinit";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

25
pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch Normal file
View File

@ -0,0 +1,25 @@
From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:31:12 -0500
Subject: [PATCH 1/2] Remove impure smbd search path
---
src/core/ksambashare.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
index e810ce4..7cfb4e6 100644
--- a/src/core/ksambashare.cpp
+++ b/src/core/ksambashare.cpp
@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled()
{
const bool daemonExists =
- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
if (!daemonExists) {
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
}
--
2.30.1

25
pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch Normal file
View File

@ -0,0 +1,25 @@
From 59d26b68704373d405b70806f890ddd545cc976a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:31:48 -0500
Subject: [PATCH 2/2] Debug module loader
---
src/kiod/kiod_main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kiod/kiod_main.cpp b/src/kiod/kiod_main.cpp
index 1976ee1..eb402bf 100644
--- a/src/kiod/kiod_main.cpp
+++ b/src/kiod/kiod_main.cpp
@@ -50,7 +50,7 @@ void KIOD::loadModule(const QString &name)
module = factory->create<KDEDModule>();
}
if (!module) {
- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
+ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
return;
}
module->setModuleName(name); // makes it register to DBus
--
2.30.1

7
pkgs/development/libraries/kde-frameworks/kio/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchpatch,
mkDerivation, fetchpatch,
extra-cmake-modules, kdoctools, qttools,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
@ -9,7 +9,6 @@
mkDerivation {
name = "kio";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
@ -22,7 +21,7 @@ mkDerivation {
];
outputs = [ "out" "dev" ];
patches = [
./samba-search-path.patch
./kio-debug-module-loader.patch
./0001-Remove-impure-smbd-search-path.patch
./0002-Debug-module-loader.patch
];
}

13
pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
View File

@ -1,13 +0,0 @@
Index: kio-5.33.0/src/kiod/kiod_main.cpp
===================================================================
--- kio-5.33.0.orig/src/kiod/kiod_main.cpp
+++ kio-5.33.0/src/kiod/kiod_main.cpp
@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam
module = factory->create<KDEDModule>();
}
if (!module) {
- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
+ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
return;
}
module->setModuleName(name); // makes it register to DBus

14
pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
View File

@ -1,14 +0,0 @@
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
index 1895783..9fe7286 100644
--- a/src/core/ksambashare.cpp
+++ b/src/core/ksambashare.cpp
@@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled()
{
const bool daemonExists =
- !QStandardPaths::findExecutable(QStringLiteral("smbd"),
- {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
if (!daemonExists) {
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
}

3
pkgs/development/libraries/kde-frameworks/kirigami2.nix
View File

@ -2,9 +2,6 @@
mkDerivation {
name = "kirigami2";
meta = {
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/kde-frameworks/kitemmodels.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
qtbase
}:
mkDerivation {
name = "kitemmodels";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/kde-frameworks/kitemviews.nix
View File

@ -6,10 +6,6 @@
mkDerivation {
name = "kitemviews";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];

3
pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, qttools,
kcoreaddons, kwidgetsaddons, qtx11extras
}:
mkDerivation {
name = "kjobwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
}

3
pkgs/development/libraries/kde-frameworks/kjs.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, kdoctools,
pcre, qtbase,
}:
mkDerivation {
name = "kjs";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ pcre qtbase ];
}

3
pkgs/development/libraries/kde-frameworks/kjsembed.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, kdoctools, qttools,
ki18n, kjs, qtsvg,
}:
mkDerivation {
name = "kjsembed";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [ ki18n qtsvg ];
propagatedBuildInputs = [ kjs ];

3
pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib
{ mkDerivation
, extra-cmake-modules
, kparts
, kxmlgui
@ -6,7 +6,6 @@
mkDerivation {
name = "kmediaplayer";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kparts kxmlgui ];
}

25
pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch Normal file
View File

@ -0,0 +1,25 @@
From 09b5063e115c36b75e291230175b449a0f6d0c29 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 13:34:33 -0500
Subject: [PATCH] Delay resolving knsrcdir
---
KF5NewStuffCoreConfig.cmake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in
index c65c7c4..3275627 100644
--- a/KF5NewStuffCoreConfig.cmake.in
+++ b/KF5NewStuffCoreConfig.cmake.in
@@ -3,7 +3,7 @@
include(CMakeFindDependencyMacro)
find_dependency(KF5Attica "@KF_DEP_VERSION@")
-set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles")
+set(KDE_INSTALL_KNSRCDIR "${KDE_INSTALL_DATADIR}/knsrcfiles")
include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake")
@PACKAGE_INCLUDE_CORE_QCHTARGETS@
--
2.30.1

12
pkgs/development/libraries/kde-frameworks/knewstuff.nix → pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchpatch,
mkDerivation, fetchpatch,
extra-cmake-modules,
attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
@ -8,7 +8,6 @@
mkDerivation {
name = "knewstuff";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
@ -16,10 +15,7 @@ mkDerivation {
ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2
];
propagatedBuildInputs = [ attica kservice kxmlgui ];
patches = [ (fetchpatch {
url = "https://github.com/KDE/knewstuff/commit/dbf788c10130eaa3f5ea37a7f22eb4569471aa04.patch";
sha256 = "1225rgqg1j120nvhgsahvsq2xlkg91lr37zp14x19krixxgx521j";
revert = true;
}) ];
patches = [
./0001-Delay-resolving-knsrcdir.patch
];
}

3
pkgs/development/libraries/kde-frameworks/knotifications.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib
{ mkDerivation
, extra-cmake-modules
, kcodecs, kconfig, kcoreaddons, kwindowsystem
, libdbusmenu
@ -8,7 +8,6 @@
mkDerivation {
name = "knotifications";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras

3
pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
View File

@ -1,12 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kcompletion, kconfig, ki18n, kio, phonon, qtbase,
}:
mkDerivation {
name = "knotifyconfig";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcompletion kconfig ki18n kio phonon ];
propagatedBuildInputs = [ qtbase ];

25
pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch Normal file
View File

@ -0,0 +1,25 @@
From c134a83d226fc6b92412ee714bb6c7ab7e3a800f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:25:18 -0500
Subject: [PATCH 1/2] Allow external paths default
---
src/kpackage/package.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index 36f5600..881f176 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -858,7 +858,7 @@ PackagePrivate::PackagePrivate()
: QSharedData()
, fallbackPackage(nullptr)
, metadata(nullptr)
- , externalPaths(false)
+ , externalPaths(true)
, valid(false)
, checkedValid(false)
{
--
2.30.1

39
pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch Normal file
View File

@ -0,0 +1,39 @@
From b1c0d2542234247a5051df015d70347597dfe8d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:26:40 -0500
Subject: [PATCH 2/2] QDirIterator follow symlinks
---
src/kpackage/packageloader.cpp | 2 +-
src/kpackage/private/packagejobthread.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
index f03d882..d5aee56 100644
--- a/src/kpackage/packageloader.cpp
+++ b/src/kpackage/packageloader.cpp
@@ -234,7 +234,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
} else {
qCDebug(KPACKAGE_LOG) << "kpluginindex: Not cached" << plugindir;
// If there's no cache file, fall back to listing the directory
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
index 3eed307..dd6ca6e 100644
--- a/src/kpackage/private/packagejobthread.cpp
+++ b/src/kpackage/private/packagejobthread.cpp
@@ -108,7 +108,7 @@ bool indexDirectory(const QString &dir, const QString &dest)
QJsonArray plugins;
- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
it.next();
const QString path = it.fileInfo().absoluteFilePath();
--
2.30.1

13
pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index 5aec9fd..b15c933 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(nullptr),
metadata(nullptr),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

7
pkgs/development/libraries/kde-frameworks/kpackage/default.nix
View File

@ -1,16 +1,15 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, kdoctools,
karchive, kconfig, kcoreaddons, ki18n, qtbase,
}:
mkDerivation {
name = "kpackage";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
patches = [
./allow-external-paths.patch
./qdiriterator-follow-symlinks.patch
./0001-Allow-external-paths-default.patch
./0002-QDirIterator-follow-symlinks.patch
];
}

26
pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
View File

@ -1,26 +0,0 @@
Index: kpackage-5.30.0/src/kpackage/packageloader.cpp
===================================================================
--- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp
+++ kpackage-5.30.0/src/kpackage/packageloader.cpp
@@ -238,7 +238,7 @@ QList<KPluginMetaData> PackageLoader::li
} else {
//qDebug() << "Not cached";
// If there's no cache file, fall back to listing the directory
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") };
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
===================================================================
--- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp
+++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir,
QJsonArray plugins;
- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
it.next();
const QString path = it.fileInfo().absoluteFilePath();

3
pkgs/development/libraries/kde-frameworks/kparts.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications,
kservice, ktextwidgets, kwidgetsaddons, kxmlgui
@ -7,7 +7,6 @@
mkDerivation {
name = "kparts";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice

3
pkgs/development/libraries/kde-frameworks/kpeople.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase,
qtdeclarative,
@ -7,7 +7,6 @@
mkDerivation {
name = "kpeople";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative

6
pkgs/development/libraries/kde-frameworks/kplotting.nix
View File

@ -1,13 +1,9 @@
{ mkDerivation, lib
{ mkDerivation
, extra-cmake-modules, qttools, qtbase
}:
mkDerivation {
name = "kplotting";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qttools ];
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/kde-frameworks/kpty.nix
View File

@ -1,8 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
mkDerivation {
name = "kpty";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons ki18n qtbase ];
outputs = [ "out" "dev" ];

7
pkgs/development/libraries/kde-frameworks/kquickcharts.nix
View File

@ -1,14 +1,11 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules,
qtquickcontrols2,
qtquickcontrols2, qtbase,
}:
mkDerivation {
name = "kquickcharts";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtquickcontrols2 ];
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/kde-frameworks/kross.nix
View File

@ -1,11 +1,10 @@
{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
{ mkDerivation, extra-cmake-modules, kcompletion, kcoreaddons
, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
, kxmlgui, qtbase, qtscript, qtxmlpatterns,
}:
mkDerivation {
name = "kross";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcompletion kcoreaddons kxmlgui ];
propagatedBuildInputs = [

3
pkgs/development/libraries/kde-frameworks/krunner.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchpatch,
mkDerivation, fetchpatch,
extra-cmake-modules,
kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
qtdeclarative, solid, threadweaver, kwindowsystem
@ -8,7 +8,6 @@
let
self = mkDerivation {
name = "krunner";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid

3
pkgs/development/libraries/kde-frameworks/kservice/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
bison, extra-cmake-modules, flex,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
qtbase, shared-mime-info,
@ -7,7 +7,6 @@
mkDerivation {
name = "kservice";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedNativeBuildInputs = [ bison flex ];
buildInputs = [

3
pkgs/development/libraries/kde-frameworks/ktexteditor.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, perl,
karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols,
@ -8,7 +8,6 @@
mkDerivation {
name = "ktexteditor";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript

3
pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, qttools,
kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice,
kwindowsystem, qtbase, sonnet,
@ -7,7 +7,6 @@
mkDerivation {
name = "ktextwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem

3
pkgs/development/libraries/kde-frameworks/kunitconversion.nix
View File

@ -1,8 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }:
{ mkDerivation, extra-cmake-modules, ki18n, qtbase, }:
mkDerivation {
name = "kunitconversion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ki18n qtbase ];
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/kde-frameworks/kwallet.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
@ -8,7 +8,6 @@
mkDerivation {
name = "kwallet";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes

6
pkgs/development/libraries/kde-frameworks/kwayland.nix
View File

@ -1,15 +1,11 @@
{
mkDerivation, lib, propagateBin,
mkDerivation, propagateBin,
extra-cmake-modules,
plasma-wayland-protocols, qtbase, wayland, wayland-protocols
}:
mkDerivation {
name = "kwayland";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
propagatedBuildInputs = [ qtbase ];

Some files were not shown because too many files have changed in this diff Show More