nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-09 15:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

kconfigwidgets: drop merged patch

Browse Source
This commit is contained in:
K900 2022-08-14 13:20:17 +03:00
parent 2934fa32ea
commit 937ede3b16
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ let
baloo = callPackage ./baloo.nix {}; baloo = callPackage ./baloo.nix {};
kbookmarks = callPackage ./kbookmarks.nix {}; kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {}; kcmutils = callPackage ./kcmutils {};
kconfigwidgets = callPackage ./kconfigwidgets {}; kconfigwidgets = callPackage ./kconfigwidgets.nix {};
kdav = callPackage ./kdav.nix {}; kdav = callPackage ./kdav.nix {};
kdeclarative = callPackage ./kdeclarative.nix {}; kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {}; kded = callPackage ./kded.nix {};

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

@ -8,7 +8,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kguiaddons ki18n qtbase qttools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ];
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
patches = [ ./0001-QDirIterator-follow-symlinks.patch ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
outputBin = "dev"; outputBin = "dev";
postInstall = '' postInstall = ''

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

@ -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