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

* Remove stupid ‘libraryPath’ entries from ~/.config/Trolltech.conf

Browse Source 
that can randomly cause KDE to fail.

svn path=/nixos/trunk/; revision=27925
This commit is contained in:
Eelco Dolstra 2011-07-24 22:07:58 +00:00
parent d121bb15b5
commit a9f599154a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/services/x11/desktop-managers/kde4.nix
View File

@ -21,7 +21,7 @@ in
environment.kdePackages = mkOption { environment.kdePackages = mkOption {
default = []; default = [];
example = [ pkgs.kde4.kdesdk ]; example = "[ pkgs.kde4.kdesdk ]";
type = types.list types.package; type = types.list types.package;
description = "This option is obsolete. Please use <option>environment.systemPackages</option> instead."; description = "This option is obsolete. Please use <option>environment.systemPackages</option> instead.";
}; };
@ -52,6 +52,17 @@ in
# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
rm -fv $HOME/.kde/cache-*/icon-cache.kcache rm -fv $HOME/.kde/cache-*/icon-cache.kcache
# Qt writes a weird ‘libraryPath’ line to
# ~/.config/Trolltech.conf that causes the KDE plugin
# paths of previous KDE invocations to be searched.
# Obviously using mismatching KDE libraries is potentially
# disastrous, so here we nuke references to the Nix store
# in Trolltech.conf. A better solution would be to stop
# Qt from doing this wackiness in the first place.
if [ -e $HOME/.config/Trolltech.conf ]; then
sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
fi
# Start KDE. # Start KDE.
exec ${pkgs.kde4.kdebase_workspace}/bin/startkde exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
''; '';
@ -110,6 +121,7 @@ in
pkgs.shared_mime_info pkgs.shared_mime_info
xorg.xmessage # so that startkde can show error messages xorg.xmessage # so that startkde can show error messages
xorg.xset # used by startkde, non-essential xorg.xset # used by startkde, non-essential
xorg.xauth # used by kdesu
] ]
) ++ config.environment.kdePackages; ) ++ config.environment.kdePackages;