From 0054a127726b54349ef6882abf286d73eec6e78f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 27 Oct 2015 18:12:17 -0500
Subject: [PATCH] kde-gtk-config: follow symlinks

---
 pkgs/desktops/plasma-5.4/default.nix          |  2 +-
 .../kde-gtk-config/0001-follow-symlinks.patch | 39 +++++++++++++++++++
 .../default.nix}                              |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch
 rename pkgs/desktops/plasma-5.4/{kde-gtk-config.nix => kde-gtk-config/default.nix} (91%)

diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix
index 59b09a2dfbe..570134d824f 100644
--- a/pkgs/desktops/plasma-5.4/default.nix
+++ b/pkgs/desktops/plasma-5.4/default.nix
@@ -51,7 +51,7 @@ let
       let version = (builtins.parseDrvName breeze-qt5.name).version;
       in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-    kde-gtk-config = callPackage ./kde-gtk-config.nix {};
+    kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};
     kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
     kgamma5 = callPackage ./kgamma5.nix {};
diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch
new file mode 100644
index 00000000000..759eda4cc13
--- /dev/null
+++ b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch
@@ -0,0 +1,39 @@
+From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Tue, 27 Oct 2015 18:07:54 -0500
+Subject: [PATCH] follow symlinks
+
+---
+ src/appearancegtk2.cpp  | 2 +-
+ src/iconthemesmodel.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
+index b1e0b52..095cddc 100644
+--- a/src/appearancegtk2.cpp
++++ b/src/appearancegtk2.cpp
+@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+     QStringList themes=installedThemes();
+     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
+     if(themes.size()==1) {
+-        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
++        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while(it.hasNext()) {
+             it.next();
+             if(it.fileName()=="gtkrc") {
+diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
+index 07c7ad7..b04d978 100644
+--- a/src/iconthemesmodel.cpp
++++ b/src/iconthemesmodel.cpp
+@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
+     
+     foreach(const QString& dir, dirs) {
+         QDir userIconsDir(dir);
+-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
++        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
+         while(it.hasNext()) {
+             QString currentPath = it.next();
+             QDir dir(currentPath);
+-- 
+2.6.2
+
diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix
similarity index 91%
rename from pkgs/desktops/plasma-5.4/kde-gtk-config.nix
rename to pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix
index fb5059b7eb8..6b41599994d 100644
--- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix
+++ b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix
@@ -14,6 +14,7 @@
 
 plasmaPackage {
   name = "kde-gtk-config";
+  patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes