tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
kcmutils: drop merged patch
+1
-29
+1
-1
pkgs/development/libraries/kde-frameworks/default.nix
+1
-1
pkgs/development/libraries/kde-frameworks/default.nix
···
152
152
# TIER 3
153
153
baloo = callPackage ./baloo.nix {};
154
154
kbookmarks = callPackage ./kbookmarks.nix {};
155
-
kcmutils = callPackage ./kcmutils {};
155
+
kcmutils = callPackage ./kcmutils.nix {};
156
156
kconfigwidgets = callPackage ./kconfigwidgets.nix {};
157
157
kdav = callPackage ./kdav.nix {};
158
158
kdeclarative = callPackage ./kdeclarative.nix {};
-25
pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch
-25
pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch
···
1
-
From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
2
-
From: Thomas Tuegel <ttuegel@mailbox.org>
3
-
Date: Mon, 13 Jul 2020 11:23:36 -0500
4
-
Subject: [PATCH] kcmutils follow symlinks
5
-
6
-
---
7
-
src/kpluginselector.cpp | 2 +-
8
-
1 file changed, 1 insertion(+), 1 deletion(-)
9
-
10
-
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
11
-
index 46deef5..2eacb9f 100644
12
-
--- a/src/kpluginselector.cpp
13
-
+++ b/src/kpluginselector.cpp
14
-
@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
15
-
QStringList desktopFileNames;
16
-
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
17
-
for (const QString &dir : dirs) {
18
-
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
19
-
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
20
-
while (it.hasNext()) {
21
-
desktopFileNames.append(it.next());
22
-
}
23
-
--
24
-
2.25.4
25
-