diff --git a/pkgs/desktops/kde-4.4/base-workspace/builder.sh b/pkgs/desktops/kde-4.4/base-workspace/builder.sh deleted file mode 100644 index 97aba633c560..000000000000 --- a/pkgs/desktops/kde-4.4/base-workspace/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in plasma/applets/systemtray/CMakeLists.txt plasma/applets/systemtray/notificationitemwatcher/CMakeLists.txt - do - sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$kdelibs_experimental/share/dbus-1|" $i - done -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index e574862c0bbe..ea93a625ed8a 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit -, qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings +, qt4, sip, pyqt4, kdelibs, kdepimlibs, , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt @@ -11,9 +11,7 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.0/src/kdebase-workspace-4.4.0.tar.bz2; sha256 = "16rc4cpq97bfcvj0bmq9k3kv48gjbx8569m7lg3qm91xg8nz79hn"; }; - inherit kdelibs_experimental; - builder = ./builder.sh; - buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc + buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; meta = { diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index cc672b6a396e..2d1dc4369412 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -65,15 +65,13 @@ pkgs.recurseIntoAttrs (rec { inherit (pkgs.xlibs) libXScrnSaver; inherit automoc4 phonon strigi soprano qca2 attica polkit_qt; }; - - kdelibs_experimental = null; ### BASE kdebase_workspace = import ./base-workspace { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; - inherit kdelibs kdelibs_experimental kdepimlibs kdebindings; + inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; }; @@ -141,7 +139,7 @@ pkgs.recurseIntoAttrs (rec { kdemultimedia = import ./multimedia { inherit (pkgs) stdenv fetchurl lib cmake perl qt4; inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia lame; - inherit kdelibs kdelibs_experimental; + inherit kdelibs; inherit automoc4 phonon; }; @@ -157,14 +155,14 @@ pkgs.recurseIntoAttrs (rec { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost gpgme libassuan libgpgerror libxslt; inherit (pkgs) shared_mime_info; inherit (pkgs.xlibs) libXScrnSaver; - inherit kdelibs kdelibs_experimental kdepimlibs; + inherit kdelibs kdepimlibs; inherit automoc4 phonon akonadi strigi soprano qca2; }; kdepim_runtime = import ./pim-runtime { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost; inherit (pkgs) shared_mime_info; - inherit kdelibs kdelibs_experimental kdepimlibs; + inherit kdelibs kdepimlibs; inherit automoc4 phonon akonadi soprano strigi; }; @@ -188,7 +186,7 @@ pkgs.recurseIntoAttrs (rec { kdeutils = import ./utils { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer; - inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings; + inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; }; diff --git a/pkgs/desktops/kde-4.4/multimedia/default.nix b/pkgs/desktops/kde-4.4/multimedia/default.nix index e6c497318969..ed31e2823e2a 100644 --- a/pkgs/desktops/kde-4.4/multimedia/default.nix +++ b/pkgs/desktops/kde-4.4/multimedia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, cdparanoia, lame -, kdelibs, kdelibs_experimental, automoc4, phonon}: +, kdelibs, automoc4, phonon}: stdenv.mkDerivation { name = "kdemultimedia-4.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0zvllvwj2nj7qh9jq5048d37jj55cml7d0y1k4rk1ba31mmp7vrn"; }; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame - kdelibs kdelibs_experimental automoc4 phonon ]; + kdelibs automoc4 phonon ]; meta = { description = "KDE Multimedia"; longDescription = '' diff --git a/pkgs/desktops/kde-4.4/pim-runtime/default.nix b/pkgs/desktops/kde-4.4/pim-runtime/default.nix index d8bf0393be29..371520449d9f 100644 --- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info -, kdelibs, kdelibs_experimental, kdepimlibs +, kdelibs, kdepimlibs , automoc4, phonon, akonadi, soprano, strigi}: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1nfzxhc2la8p4nhgbrngqz3a5ymz9783nqpl82y7dsawbn7il2z1"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info - kdelibs kdelibs_experimental kdepimlibs + kdelibs kdepimlibs automoc4 phonon akonadi soprano strigi ]; builder = ./builder.sh; meta = { diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix index a2231ee2c180..a950b3dc9a9c 100644 --- a/pkgs/desktops/kde-4.4/pim/default.nix +++ b/pkgs/desktops/kde-4.4/pim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt , shared_mime_info, libXScrnSaver -, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: +, kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: stdenv.mkDerivation { name = "kdepim-4.4.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { builder = ./builder.sh; buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt shared_mime_info libXScrnSaver - kdelibs kdelibs_experimental kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ]; + kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ]; meta = { description = "KDE PIM tools"; longDescription = '' diff --git a/pkgs/desktops/kde-4.4/utils/default.nix b/pkgs/desktops/kde-4.4/utils/default.nix index c4af85eb3f21..86815c3583bf 100644 --- a/pkgs/desktops/kde-4.4/utils/default.nix +++ b/pkgs/desktops/kde-4.4/utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz , sip, pyqt4, pycups, system_config_printer -, kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: +, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: stdenv.mkDerivation { name = "kdeutils-4.4.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit system_config_printer; buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer - kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; + kdelibs kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; meta = { description = "KDE Utilities";