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

* Hacks to keep KDE 4.5 working. The latest D-Bus is more strict in

Browse Source 
checking function arguments, so DBUS_FATAL_WARNINGS=0 is necessary
  to prevent KDE from aborting.  Also put the Phonon gstreamer backend
  in the environment if available.

svn path=/nixos/trunk/; revision=28113
This commit is contained in:
Eelco Dolstra 2011-08-01 14:28:28 +00:00
parent 7a7d781e6a
commit d890e74d9c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,10 @@ in
sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
fi fi
${optionalString (!isKDE47) ''
export DBUS_FATAL_WARNINGS=0
''}
# Start KDE. # Start KDE.
exec ${pkgs.kde4.kdebase_workspace}/bin/startkde exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
''; '';
@ -98,7 +102,7 @@ in
pkgs.gst_all.gstFfmpeg # for mp3 playback pkgs.gst_all.gstFfmpeg # for mp3 playback
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
] ] ++ optional (pkgs ? phonon_backend_gstreamer) pkgs.phonon_backend_gstreamer
else else
# KDE >= 4.7 # KDE >= 4.7
[ pkgs.kde4.kdelibs [ pkgs.kde4.kdelibs