diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2014-10-06 08:31:47 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2014-10-06 08:33:26 -0500 |
| commit | 95b12bf0bedd1cd241ea2468464286dcc2a209bb (patch) | |
| tree | 146b7fa568a487906a911a1d7c4ae94fe9aae84c /pkgs/tools/misc/kde-gtk-config | |
| parent | 08c365979a1118a2e3a3a55a5066f037fc7a2bea (diff) | |
| download | nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar.gz nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar.bz2 nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar.lz nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar.xz nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.tar.zst nixlib-95b12bf0bedd1cd241ea2468464286dcc2a209bb.zip | |
kde-gtk-config: handle symlinked themes
Diffstat (limited to 'pkgs/tools/misc/kde-gtk-config')
| -rw-r--r-- | pkgs/tools/misc/kde-gtk-config/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index 873d2adde7f9..88df0b6b5445 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { pkgconfig ]; - patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ]; + patches = [ + ./kde-gtk-config-2.2.1-install-paths.patch + ./kde-gtk-config-follow-symlinks.patch + ]; cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch new file mode 100644 index 000000000000..e291589e82e3 --- /dev/null +++ b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp +index 3d89c82..4dcce69 100644 +--- a/src/appearancegtk2.cpp ++++ b/src/appearancegtk2.cpp +@@ -56,7 +56,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") { |