diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-11 16:40:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-11 16:40:59 +0000 |
| commit | eff916e9d9bb6e332285e3cc26f9cd83a40b562a (patch) | |
| tree | a98824c2645633ca18c8941a2be11e57d2114a38 /pkgs | |
| parent | cc3d1e1c0951cd7429be9e0118bfdc6ba56867a1 (diff) | |
| download | nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar.gz nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar.bz2 nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar.lz nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar.xz nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.tar.zst nixlib-eff916e9d9bb6e332285e3cc26f9cd83a40b562a.zip | |
* Don't do compositing when using the OpenGL software renderer
(NixOS/121). svn path=/nixpkgs/branches/x-updates/; revision=26281
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.5/base-workspace/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch | 17 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index c409f4d0219a..0fbafd2e4071 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 000000000000..7c9e102bc95a --- /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; ++ } + } + + |