public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde-gtk-config: handle symlinked themes

Browse Source
This commit is contained in:
Thomas Tuegel 2014-10-06 08:31:47 -05:00
parent 08c365979a
commit 95b12bf0be
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/kde-gtk-config/default.nix
View File

@ -22,7 +22,10 @@ stdenv.mkDerivation {
pkgconfig 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 = '' cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include

13
pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch Normal file
View File

@ -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") {