From d890e74d9c62f16c58472db6c594076e05924074 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Aug 2011 14:28:28 +0000 Subject: [PATCH] * Hacks to keep KDE 4.5 working. The latest D-Bus is more strict in 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 --- modules/services/x11/desktop-managers/kde4.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix index 2616bd56a25e..3c353faf8706 100644 --- a/modules/services/x11/desktop-managers/kde4.nix +++ b/modules/services/x11/desktop-managers/kde4.nix @@ -65,6 +65,10 @@ in sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf fi + ${optionalString (!isKDE47) '' + export DBUS_FATAL_WARNINGS=0 + ''} + # Start KDE. exec ${pkgs.kde4.kdebase_workspace}/bin/startkde ''; @@ -98,7 +102,7 @@ in pkgs.gst_all.gstFfmpeg # for mp3 playback xorg.xmessage # so that startkde can show error messages xorg.xset # used by startkde, non-essential - ] + ] ++ optional (pkgs ? phonon_backend_gstreamer) pkgs.phonon_backend_gstreamer else # KDE >= 4.7 [ pkgs.kde4.kdelibs