diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index c409f4d0219..0fbafd2e407 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -15,6 +15,13 @@ kde.package { strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate pciutils bluez networkmanager ]; + patches = + [ # Don't do compositing with the software GLX driver, since it's + # completely broken (corrupt output, server crashes, etc.). + # (NixOS/121) + ./no-software-compositing.patch + ]; + meta = { description = "KDE base platform-specific components"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; diff --git a/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch b/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch new file mode 100644 index 00000000000..7c9e102bc95 --- /dev/null +++ b/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch @@ -0,0 +1,17 @@ +diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp +--- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp 2010-06-24 18:28:18.000000000 +0200 ++++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp 2011-03-11 16:33:07.296566718 +0100 +@@ -314,9 +314,10 @@ + //else if( mDriver == "radeon" ) + // { + // } +- //else if( mDriver == "software" ) +- // { +- // } ++ else if( mDriver == "software" ) ++ { ++ mRecommendCompositing = false; ++ } + } + +