diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-14 07:09:03 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-30 16:10:37 -0500 |
| commit | f416ba4833c9c4b66833846811b04129fcaf1101 (patch) | |
| tree | 723155bb8ff8b474f403b84378f46a44adb11b2b /pkgs/desktops | |
| parent | a6b201fd2cd248c3d16984f31e2c714014020853 (diff) | |
| download | nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar.gz nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar.bz2 nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar.lz nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar.xz nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.tar.zst nixlib-f416ba4833c9c4b66833846811b04129fcaf1101.zip | |
libksysguard: follow symlinks
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5.4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch | 25 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5.4/libksysguard/default.nix (renamed from pkgs/desktops/plasma-5.4/libksysguard.nix) | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix index af2602c9afd0..61a06421c3dd 100644 --- a/pkgs/desktops/plasma-5.4/default.nix +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -66,7 +66,7 @@ let kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard.nix {}; + libksysguard = callPackage ./libksysguard {}; milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; oxygen-fonts = callPackage ./oxygen-fonts.nix {}; diff --git a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..fbbb11ae7556 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 07:07:22 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + processui/scripting.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/processui/scripting.cpp b/processui/scripting.cpp +index efed8ff..841761a 100644 +--- a/processui/scripting.cpp ++++ b/processui/scripting.cpp +@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { + QStringList scripts; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory); + Q_FOREACH (const QString& dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + scripts.append(it.next()); + } +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard/default.nix index 81e59975db2e..373221b2b305 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard/default.nix @@ -6,6 +6,7 @@ plasmaPackage { name = "libksysguard"; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; |