mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 13:23:17 +00:00
kconfigwidgets: drop merged patch
This commit is contained in:
parent
2934fa32ea
commit
937ede3b16
@ -153,7 +153,7 @@ let
|
||||
baloo = callPackage ./baloo.nix {};
|
||||
kbookmarks = callPackage ./kbookmarks.nix {};
|
||||
kcmutils = callPackage ./kcmutils {};
|
||||
kconfigwidgets = callPackage ./kconfigwidgets {};
|
||||
kconfigwidgets = callPackage ./kconfigwidgets.nix {};
|
||||
kdav = callPackage ./kdav.nix {};
|
||||
kdeclarative = callPackage ./kdeclarative.nix {};
|
||||
kded = callPackage ./kded.nix {};
|
||||
|
@ -8,7 +8,6 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kguiaddons ki18n qtbase qttools ];
|
||||
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
|
||||
patches = [ ./0001-QDirIterator-follow-symlinks.patch ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
postInstall = ''
|
@ -1,25 +0,0 @@
|
||||
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 a053cd7..787d375 100644
|
||||
--- a/src/khelpclient.cpp
|
||||
+++ b/src/khelpclient.cpp
|
||||
@@ -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) {
|
||||
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
const QString desktopPath(it.next());
|
||||
KDesktopFile desktopFile(desktopPath);
|
||||
--
|
||||
2.30.1
|
||||
|
Loading…
Reference in New Issue
Block a user