diff --git a/pkgs/desktops/kde-4.7/base-runtime/default.nix b/pkgs/desktops/kde-4.7/base-runtime/default.nix deleted file mode 100644 index 293bc8dd04d6..000000000000 --- a/pkgs/desktops/kde-4.7/base-runtime/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, - shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano, - cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }: - -kde.package { - - buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info - exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica - makeWrapper]; - -# TODO: OpenSLP, OpenEXR - postInstall = '' - rm -v $out/share/icons/default.kde4 - wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ - --prefix PATH : "${virtuoso}/bin" - ''; - - meta = { - description = "KDE runtime"; - longDescription = "Libraries and tools which supports running KDE desktop applications"; - license = "LGPL"; - kde.name = "kdebase-runtime"; - }; -} diff --git a/pkgs/desktops/kde-4.7/base-workspace/default.nix b/pkgs/desktops/kde-4.7/base-workspace/default.nix deleted file mode 100644 index 0fbafd2e4071..000000000000 --- a/pkgs/desktops/kde-4.7/base-workspace/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kde, cmake, perl, python, pam, consolekit -, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings -, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver -, lm_sensors, libxklavier, libusb, libpthreadstubs, boost -, automoc4, strigi, soprano, qimageblitz, akonadi -, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager -}: - -kde.package { - -# TODO: qedje, qzion, ggadgets, libgps - buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst - kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 - libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 - 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"; - license = "GPL"; - kde.name = "kdebase-workspace"; - }; -} diff --git a/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch b/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch deleted file mode 100644 index 7c9e102bc95a..000000000000 --- a/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch +++ /dev/null @@ -1,17 +0,0 @@ -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; -+ } - } - - diff --git a/pkgs/desktops/kde-4.7/base/default.nix b/pkgs/desktops/kde-4.7/base/default.nix deleted file mode 100644 index 2f0c78e5f01d..000000000000 --- a/pkgs/desktops/kde-4.7/base/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi -, qimageblitz, soprano}: - -kde.package { - preConfigure = "cd apps"; - - buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4 - strigi qimageblitz ]; - - meta = { - description = "KDE Base components"; - longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole"; - license = "GPL"; - kde.name = "kdebase"; - }; -}