mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
* 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
This commit is contained in:
parent
7a7d781e6a
commit
d890e74d9c
1 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue