* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557

71 files changed, 618 insertions, 13 deletions

diff --git a/pkgs/desktops/kde-3/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix
new file mode 100644
index 0000000000000..814d462915715
--- /dev/null
+++ b/pkgs/desktops/kde-3/kdebase/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
+, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
+}:
+
+# Note: the glib dependency is needed for nspluginviewer.
+
+let version = "3.5.10"; in
+
+stdenv.mkDerivation {
+  name = "kdebase-${version}";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
+    sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp";
+  };
+
+  buildInputs = [
+    pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
+    fontconfig pam hal dbus glib
+    xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
+    xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
+    xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
+    xlibs.scrnsaverproto xlibs.libXScrnSaver
+    xlibs.libXcomposite xlibs.libXfixes
+  ];
+
+  configureFlags = ''
+    --without-arts 
+    --with-ssl-dir=${openssl}
+    --with-extra-includes=${libjpeg}/include
+  '';
+
+  # Prevent configure from looking for pkg-config and freetype-config
+  # in the wrong location (it looks in /usr/bin etc. *before* looking
+  # in $PATH).
+  preConfigure = ''
+    substituteInPlace configure \
+      --replace /usr/bin /no-such-path \
+      --replace /usr/local/bin /no-such-path \
+      --replace /opt/local/bin /no-such-path
+  '';
+
+  # Quick hack to work around a faulty dependency in
+  # konqueror/keditbookmarks/Makefile.am (${includedir} should be
+  # ${kdelibs} or so).
+  preBuild = ''
+    ensureDir $out/include
+    ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/
+  '';
+  
+  postInstall = "rm $out/include/kbookmarknotifier.h";
+
+  # Work around some inexplicable build failure starting in kdebase 3.5.9.
+  LDFLAGS = "-L${kdelibs}/lib";
+}
diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
new file mode 100644
index 0000000000000..86a85ab042bbb
--- /dev/null
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
+, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, freetype, bzip2, cups, attr, acl
+}:
+
+let version = "3.5.10"; in
+
+stdenv.mkDerivation {
+  name = "kdelibs-${version}";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
+    sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
+  };
+
+  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
+  
+  buildInputs = [
+    zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    libxslt expat libtool freetype bzip2 cups
+    xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
+  ];
+
+  propagatedBuildInputs = [attr acl];
+
+  # Prevent configure from looking for pkg-config and freetype-config
+  # in the wrong location (it looks in /usr/bin etc. *before* looking
+  # in $PATH).
+  preConfigure = ''
+    substituteInPlace configure \
+      --replace /usr/bin /no-such-path \
+      --replace /usr/local/bin /no-such-path \
+      --replace /opt/local/bin /no-such-path
+  '';
+
+  configureFlags = ''
+    --without-arts 
+    --with-ssl-dir=${openssl}
+    --with-extra-includes=${libjpeg}/include
+    --x-includes=${xlibs.libX11}/include
+    --x-libraries=${xlibs.libX11}/lib
+  '';
+}
diff --git a/pkgs/desktops/kde-4/base/builder.sh b/pkgs/desktops/kde-4-old/base/builder.sh
index 99b357fcf1678..99b357fcf1678 100755
--- a/pkgs/desktops/kde-4/base/builder.sh
+++ b/pkgs/desktops/kde-4-old/base/builder.sh
diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4-old/base/default.nix
index ea4ee603c0256..ea4ee603c0256 100644
--- a/pkgs/desktops/kde-4/base/default.nix
+++ b/pkgs/desktops/kde-4-old/base/default.nix
diff --git a/pkgs/desktops/kde-4/decibel/default.nix b/pkgs/desktops/kde-4-old/decibel/default.nix
index ff98b48ee6fc8..ff98b48ee6fc8 100644
--- a/pkgs/desktops/kde-4/decibel/default.nix
+++ b/pkgs/desktops/kde-4-old/decibel/default.nix
diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4-old/default.nix
index 9732d9e2b2b74..9732d9e2b2b74 100644
--- a/pkgs/desktops/kde-4/default.nix
+++ b/pkgs/desktops/kde-4-old/default.nix
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4-old/edu/default.nix
index 4ee00d7652796..4ee00d7652796 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4-old/edu/default.nix
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
index 35701ecf5c688..35701ecf5c688 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
index b68959d8a9c91..b68959d8a9c91 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
index 154531dabc112..154531dabc112 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
index df54324712a15..df54324712a15 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4-old/extragear/default.nix
index c67d4b8682cb0..c67d4b8682cb0 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4-old/extragear/default.nix
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4-old/games/default.nix
index 4c3c1c115f0f3..4c3c1c115f0f3 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4-old/games/default.nix
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4-old/graphics/default.nix
index e67551fddb7f0..e67551fddb7f0 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4-old/graphics/default.nix
diff --git a/pkgs/desktops/kde-4/libs/FindIlmBase.cmake b/pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
index 1511e9509cee5..1511e9509cee5 100644
--- a/pkgs/desktops/kde-4/libs/FindIlmBase.cmake
+++ b/pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
diff --git a/pkgs/desktops/kde-4/libs/FindOpenEXR.cmake b/pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
index b1f590544fa89..b1f590544fa89 100644
--- a/pkgs/desktops/kde-4/libs/FindOpenEXR.cmake
+++ b/pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4-old/libs/default.nix
index d0995429afe6f..d0995429afe6f 100644
--- a/pkgs/desktops/kde-4/libs/default.nix
+++ b/pkgs/desktops/kde-4-old/libs/default.nix
diff --git a/pkgs/desktops/kde-4/libs/setup.sh b/pkgs/desktops/kde-4-old/libs/setup.sh
index 6f899442d27a7..6f899442d27a7 100755
--- a/pkgs/desktops/kde-4/libs/setup.sh
+++ b/pkgs/desktops/kde-4-old/libs/setup.sh
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4-old/multimedia/default.nix
index c23439b5fc012..c23439b5fc012 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4-old/multimedia/default.nix
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4-old/network/default.nix
index f006c4c5921e9..f006c4c5921e9 100644
--- a/pkgs/desktops/kde-4/network/default.nix
+++ b/pkgs/desktops/kde-4-old/network/default.nix
diff --git a/pkgs/desktops/kde-4/pim/builder.sh b/pkgs/desktops/kde-4-old/pim/builder.sh
index 8963fae048ca5..8963fae048ca5 100755
--- a/pkgs/desktops/kde-4/pim/builder.sh
+++ b/pkgs/desktops/kde-4-old/pim/builder.sh
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4-old/pim/default.nix
index f0f4184d391ff..f0f4184d391ff 100644
--- a/pkgs/desktops/kde-4/pim/default.nix
+++ b/pkgs/desktops/kde-4-old/pim/default.nix
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4-old/pimlibs/default.nix
index 6a61374a774c4..6a61374a774c4 100644
--- a/pkgs/desktops/kde-4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4-old/pimlibs/default.nix
diff --git a/pkgs/desktops/kde-4/runtime/builder.sh b/pkgs/desktops/kde-4-old/runtime/builder.sh
index 99b357fcf1678..99b357fcf1678 100755
--- a/pkgs/desktops/kde-4/runtime/builder.sh
+++ b/pkgs/desktops/kde-4-old/runtime/builder.sh
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4-old/runtime/default.nix
index 8e31bce32fdbb..8e31bce32fdbb 100644
--- a/pkgs/desktops/kde-4/runtime/default.nix
+++ b/pkgs/desktops/kde-4-old/runtime/default.nix
diff --git a/pkgs/desktops/kde-4/support/akode.nix b/pkgs/desktops/kde-4-old/support/akode.nix
index 8fdf6736572e8..8fdf6736572e8 100644
--- a/pkgs/desktops/kde-4/support/akode.nix
+++ b/pkgs/desktops/kde-4-old/support/akode.nix
diff --git a/pkgs/desktops/kde-4/support/default.nix b/pkgs/desktops/kde-4-old/support/default.nix
index 426a5811bd79c..426a5811bd79c 100644
--- a/pkgs/desktops/kde-4/support/default.nix
+++ b/pkgs/desktops/kde-4-old/support/default.nix
diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4-old/support/eigen.nix
index 163683a292153..163683a292153 100644
--- a/pkgs/desktops/kde-4/support/eigen.nix
+++ b/pkgs/desktops/kde-4-old/support/eigen.nix
diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4-old/support/gmm.nix
index 843f9f6aaed50..843f9f6aaed50 100644
--- a/pkgs/desktops/kde-4/support/gmm.nix
+++ b/pkgs/desktops/kde-4-old/support/gmm.nix
diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4-old/support/qca.nix
index fda435c7bffef..fda435c7bffef 100644
--- a/pkgs/desktops/kde-4/support/qca.nix
+++ b/pkgs/desktops/kde-4-old/support/qca.nix
diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4-old/support/qimageblitz.nix
index 3364b4eac5dad..3364b4eac5dad 100644
--- a/pkgs/desktops/kde-4/support/qimageblitz.nix
+++ b/pkgs/desktops/kde-4-old/support/qimageblitz.nix
diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4-old/support/soprano.nix
index 0cb490b9db7e4..0cb490b9db7e4 100644
--- a/pkgs/desktops/kde-4/support/soprano.nix
+++ b/pkgs/desktops/kde-4-old/support/soprano.nix
diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4-old/support/strigi.nix
index d1ec98ea25f94..d1ec98ea25f94 100644
--- a/pkgs/desktops/kde-4/support/strigi.nix
+++ b/pkgs/desktops/kde-4-old/support/strigi.nix
diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4-old/support/taglib.nix
index 9a2acc96636be..9a2acc96636be 100644
--- a/pkgs/desktops/kde-4/support/taglib.nix
+++ b/pkgs/desktops/kde-4-old/support/taglib.nix
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4-old/toys/default.nix
index b88afded4113b..b88afded4113b 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4-old/toys/default.nix
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4-old/utils/default.nix
index 4372bac8758cd..4372bac8758cd 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4-old/utils/default.nix
diff --git a/pkgs/desktops/kde-4/workspace/builder.sh b/pkgs/desktops/kde-4-old/workspace/builder.sh
index 648d6175f35ac..648d6175f35ac 100755
--- a/pkgs/desktops/kde-4/workspace/builder.sh
+++ b/pkgs/desktops/kde-4-old/workspace/builder.sh
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4-old/workspace/default.nix
index 041cd89776535..041cd89776535 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4-old/workspace/default.nix
diff --git a/pkgs/desktops/kde-4.2/admin/builder.sh b/pkgs/desktops/kde-4.2/admin/builder.sh
new file mode 100644
index 0000000000000..09cb930f04984
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/admin/builder.sh
@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
+    do
+	sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
+    done
+    
+    sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix
new file mode 100644
index 0000000000000..a741525b07100
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, python,
+ sip, pyqt4, pycups, system_config_printer, rhpl,
+ kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdeadmin-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdeadmin-4.2.1.tar.bz2;
+    sha1 = "888203103fe86010461b1e38d51ba9a20f3250e8";
+  };
+  builder = ./builder.sh;
+  inherit system_config_printer;
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl
+                  kdelibs kdepimlibs kdebindings automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix
new file mode 100644
index 0000000000000..e1cc3f4b441d0
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/artwork/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, qt4, perl, xscreensaver,
+ kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
+
+stdenv.mkDerivation {
+  name = "kdeartwork-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdeartwork-4.2.1.tar.bz2;
+    sha1 = "02bd99ca5cf303bdeb991b3e85b45dfc4e69e0bc";
+  };
+  buildInputs = [ cmake qt4 perl xscreensaver
+                  kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
+}
diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix
new file mode 100644
index 0000000000000..5728b206c92a5
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, cmake, perl, bzip2, qt4, alsaLib, xineLib, samba, kdelibs,
+ automoc4, phonon, strigi, soprano, cluceneCore}:
+
+stdenv.mkDerivation {
+  name = "kdebase-runtime-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdebase-runtime-4.2.1.tar.bz2;
+    sha1 = "e80d1882d36e4c9737e80fcb5080bc683403ddb5";
+  };
+/*  CLUCENE_HOME=cluceneCore;*/
+  buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs
+                  automoc4 phonon strigi soprano cluceneCore ];
+}
diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix
new file mode 100644
index 0000000000000..a73b8d3b7c59e
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, cmake, perl, python,
+ qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings,
+ libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver,
+ lm_sensors, libxklavier, libusb, pthread_stubs, boost,
+ automoc4, phonon, strigi, soprano, qimageblitz}:
+
+stdenv.mkDerivation {
+  name = "kdebase-workspace-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdebase-workspace-4.2.1.tar.bz2;
+    sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake perl python qt4 /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
+                  libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
+                  lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
+}
diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix
new file mode 100644
index 0000000000000..901145b5b48d1
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/base/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, perl, qt4, kdelibs, pciutils, libraw1394,
+ automoc4, phonon, strigi, qimageblitz, soprano}:
+
+stdenv.mkDerivation {
+  name = "kdebase-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdebase-4.2.1.tar.bz2;
+    sha1 = "c500024294a7621d176d26bdabdd138d18ec827d";
+  };
+  buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
+                  automoc4 phonon strigi qimageblitz soprano ];
+}
diff --git a/pkgs/desktops/kde-4.2/bindings/builder.sh b/pkgs/desktops/kde-4.2/bindings/builder.sh
new file mode 100644
index 0000000000000..e3f1df28b77cb
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/bindings/builder.sh
@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+tar xfvj $src
+cd kdebindings-*/python/pykde4
+python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip
+for i in `find . -name Makefile`
+do
+    sed -i -e "s/-O2/-O0/" $i
+done
+make
+make install
diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix
new file mode 100644
index 0000000000000..712f321bef25b
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/bindings/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4,
+ libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}:
+
+# This function will only build the pykde4 module. I don't need the other bindings and
+# some bindings are even broken.
+
+stdenv.mkDerivation {
+  name = "kdebindings-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdebindings-4.2.1.tar.bz2;
+    sha1 = "96353bb3269a7ca37ff31487a0fb7a9c25958963";
+  };
+  builder = ./builder.sh;
+  buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
+                  libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
+}
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 0376b4006c432..364c5a28a8bd9 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -24,8 +24,156 @@ rec {
     inherit (pkgs) qt4 jdk cluceneCore redland;
   };
   
+  qimageblitz = import ./support/qimageblitz {
+    inherit (pkgs) stdenv fetchurl cmake qt4;
+  };
+  
+  qca2 = import ./support/qca2 {
+    inherit (pkgs) stdenv fetchurl which qt4;
+  };
+  
+  akonadi = import ./support/akonadi {
+    inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql;
+    inherit automoc4;
+  };
+  
+  decibel = import ./support/decibel {
+    inherit (pkgs) stdenv fetchurl cmake qt4 tapioca_qt telepathy_qt dbus;
+  };
+  
+  eigen = import ./support/eigen {
+    inherit (pkgs) stdenv fetchurl cmake;
+  };
+  
 ### LIBS
-  kdelibs = import ./libs (pkgs // {
+  kdelibs = import ./libs {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
+    inherit (pkgs) giflib jasper openexr aspell avahi shared_mime_info;
+    inherit automoc4 phonon strigi soprano;
+  };
+
+### BASE  
+  kdebase_workspace = import ./base-workspace {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
+    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
+    inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
+    inherit kdelibs kdepimlibs kdebindings;
+    inherit automoc4 phonon strigi soprano qimageblitz;
+  };
+  
+  kdebase = import ./base {
+    inherit (pkgs) stdenv fetchurl cmake perl qt4 pciutils libraw1394;
+    inherit kdelibs;
+    inherit automoc4 phonon strigi qimageblitz soprano;
+  };
+  
+  kdebase_runtime = import ./base-runtime {
+    inherit (pkgs) stdenv fetchurl cmake perl bzip2 qt4;
+    inherit (pkgs) xineLib alsaLib samba cluceneCore;
+    inherit kdelibs;
     inherit automoc4 phonon strigi soprano;
-  });
+  };
+
+### ADDITIONAL
+
+  kdepimlibs = import ./pimlibs {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical openldap;
+    inherit kdelibs;
+    inherit automoc4 phonon akonadi;
+  };
+  
+  kdeadmin = import ./admin {
+    inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl;
+    inherit kdelibs kdepimlibs kdebindings;
+    inherit automoc4 phonon;
+  };
+  
+  kdeartwork = import ./artwork {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl xscreensaver;
+    inherit kdelibs kdebase_workspace;
+    inherit automoc4 phonon strigi eigen;
+  };
+  
+  kdeedu = import ./edu {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt openbabel boost;
+    inherit (pkgs) readline gmm gsl facile ocaml;
+    inherit kdelibs;
+    inherit automoc4 phonon;
+  };
+  
+  kdegraphics = import ./graphics {
+    inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends libgphoto2;
+    inherit (pkgs) libspectre djvulibre chmlib;
+    inherit (pkgs.xlibs) libXxf86vm;
+    poppler = pkgs.popplerQt4;
+    inherit kdelibs;
+    inherit automoc4 phonon strigi qimageblitz soprano qca2;
+  };
+  
+  kdemultimedia = import ./multimedia {
+    inherit (pkgs) stdenv fetchurl cmake perl qt4;
+    inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia;
+    inherit kdelibs;
+    inherit automoc4 phonon;
+  };
+  
+  kdenetwork = import ./network {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
+    inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
+    inherit (pkgs.xlibs) libXtst libXdamage libXxf86vm;
+    inherit kdelibs kdepimlibs;
+    inherit automoc4 phonon qca2 soprano qimageblitz;
+  };
+  
+  kdepim = import ./pim {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
+    inherit (pkgs) shared_mime_info;
+    inherit (pkgs.xlibs) libXScrnSaver;
+    inherit kdelibs kdepimlibs;
+    inherit automoc4 phonon akonadi strigi soprano qca2;
+  };
+  
+  kdeplasma_addons = import ./plasma-addons {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl python shared_mime_info;
+    inherit kdelibs kdebase_workspace kdepimlibs kdegraphics;
+    inherit automoc4 phonon;
+  };
+  
+  kdegames = import ./games {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl;
+    inherit kdelibs;
+    inherit automoc4 phonon qca2;
+  };
+
+  kdetoys = import ./toys {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl;
+    inherit kdelibs kdebase_workspace;
+    inherit automoc4 phonon;
+  };
+    
+  kdeutils = import ./utils {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl python gmp libzip libarchive sip pyqt4 pycups system_config_printer rhpl;
+    inherit kdelibs kdepimlibs kdebindings;
+    inherit automoc4 phonon qimageblitz;
+  };
+  
+### DEVELOPMENT
+
+  kdebindings = import ./bindings {
+    inherit (pkgs) stdenv fetchurl python sip zlib libpng pyqt4 freetype fontconfig qt4;
+    inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext;
+    inherit kdelibs;
+  };
+  
+  kdesdk = import ./sdk {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost subversion apr aprutil;
+    inherit kdelibs kdepimlibs;
+    inherit automoc4 phonon strigi;
+  };
+  
+  kdewebdev = import ./webdev {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost;
+    inherit kdelibs kdepimlibs;
+    inherit automoc4 phonon;
+  };
 }
diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix
new file mode 100644
index 0000000000000..5336ecccfb6f8
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/edu/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl,
+ facile, ocaml,
+ kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdeedu-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdeedu-4.2.1.tar.bz2;
+    sha1 = "f2381f33f6586b950e925423d135b9e66b7bf428";
+  };
+  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
+                  kdelibs automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix
new file mode 100644
index 0000000000000..cc099d9cb7041
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/games/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
+
+stdenv.mkDerivation {
+  name = "kdegames-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdegames-4.2.1.tar.bz2;
+    sha1 = "dee8a0fece054bc3b6234fa088ca16b8f5f87795";
+  };
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
+}
diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix
new file mode 100644
index 0000000000000..e468bded53ff8
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/graphics/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, libgphoto2,
+ libspectre, poppler, djvulibre, chmlib, libXxf86vm,
+ kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
+
+stdenv.mkDerivation {
+  name = "kdegraphics-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2;
+    sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e";
+  };
+  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
+                  stdenv.gcc.libc libXxf86vm
+                  kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
+}
diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix
index c6ef7fc476789..881ca1b4f8536 100644
--- a/pkgs/desktops/kde-4.2/libs/default.nix
+++ b/pkgs/desktops/kde-4.2/libs/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, cmake, perl
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
 , openexr, aspell, avahi
-, automoc4, phonon, strigi, soprano, ...
+, automoc4, phonon, strigi, soprano
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-4.2.0";
+  name = "kdelibs-4.2.1";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2;
-    md5 = "2d830a922195fefe6e073111850247ac";
+    url = mirror://kde/stable/4.2.1/src/kdelibs-4.2.1.tar.bz2;
+    sha1 = "d2214b9864b64e4a8382a9f593d082c801c58571";
   };
   
   buildInputs = [
     cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
-    shared_mime_info giflib jasper openexr aspell avahi
+    shared_mime_info giflib jasper /* openexr */ aspell avahi
     automoc4 phonon strigi soprano
   ];
 }
diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix
new file mode 100644
index 0000000000000..77f7164e82d94
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/multimedia/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, cdparanoia,
+ kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdemultimedia-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdemultimedia-4.2.1.tar.bz2;
+    sha1 = "5382c963fae0ca6528c326b73234525e170a5c2e";
+  };
+  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia
+                  kdelibs automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix
new file mode 100644
index 0000000000000..451b50ad69ec4
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/network/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn,
+ libvncserver, tapioca_qt, libmsn,
+ libXtst, libXdamage, libXxf86vm,
+ kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
+
+stdenv.mkDerivation {
+  name = "kdenetwork-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdenetwork-4.2.1.tar.bz2;
+    sha1 = "d6d730c167cd72d43904715014b2adc8f7d5bc1e";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
+                  libvncserver tapioca_qt libmsn
+		  libXtst libXdamage libXxf86vm
+                  kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ];
+}
diff --git a/pkgs/desktops/kde-4.2/pim/builder.sh b/pkgs/desktops/kde-4.2/pim/builder.sh
new file mode 100644
index 0000000000000..acc357c8a94cf
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/pim/builder.sh
@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix
new file mode 100644
index 0000000000000..8f36dac341b34
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/pim/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt,
+ shared_mime_info, libXScrnSaver,
+ kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
+
+stdenv.mkDerivation {
+  name = "kdepim-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdepim-4.2.1.tar.bz2;
+    sha1 = "be97f4d34eb19b08c30988e07a75c24d5ccad08c";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  builder = ./builder.sh;  
+  buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
+                  shared_mime_info libXScrnSaver
+                  kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
+}
diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix
new file mode 100644
index 0000000000000..134e01aa00e0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap,
+ kdelibs, automoc4, phonon, akonadi}:
+
+stdenv.mkDerivation {
+  name = "kdepimlibs-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdepimlibs-4.2.1.tar.bz2;
+    sha1 = "150228037fcd740fec0a490149cd1980ddb8fb57";
+  };
+  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap
+                  kdelibs automoc4 phonon akonadi ];
+}
diff --git a/pkgs/desktops/kde-4.2/plasma-addons/builder.sh b/pkgs/desktops/kde-4.2/plasma-addons/builder.sh
new file mode 100644
index 0000000000000..7e56e26e0534b
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/plasma-addons/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "s@\${DBUS_INTERFACES_INSTALL_DIR}@\$ENV{kdebase_workspace}/share/dbus-1/interfaces@" applets/lancelot/app/src/CMakeLists.txt
+}
+
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
new file mode 100644
index 0000000000000..ad9b16337723a
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, cmake, qt4, perl, python, shared_mime_info,
+ kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdeplasma-addons-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdeplasma-addons-4.2.1.tar.bz2;
+    sha1 = "8e164a8e1476862392371f765372c2e168895d55";
+  };
+  inherit kdebase_workspace;
+  builder = ./builder.sh;
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 perl python shared_mime_info
+                  kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/sdk/builder.sh b/pkgs/desktops/kde-4.2/sdk/builder.sh
new file mode 100644
index 0000000000000..a83d7d44c0d5f
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/sdk/builder.sh
@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "s|\${SVN_INCLUDES}|\${SVN_INCLUDES} $aprutil/include/apr-1|" kioslave/svn/CMakeLists.txt
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix
new file mode 100644
index 0000000000000..353e5ccfe72cf
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/sdk/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil,
+ kdelibs, kdepimlibs, automoc4, phonon, strigi}:
+
+stdenv.mkDerivation {
+  name = "kdesdk-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdesdk-4.2.1.tar.bz2;
+    sha1 = "dca74527bcf6e5925ec58a74196e683cc68a259a";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  builder=./builder.sh;
+  inherit aprutil;
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil
+                  kdelibs kdepimlibs automoc4 phonon strigi ];
+}
diff --git a/pkgs/desktops/kde-4.2/support/akonadi/default.nix b/pkgs/desktops/kde-4.2/support/akonadi/default.nix
new file mode 100644
index 0000000000000..8d9ba73cc57ff
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/support/akonadi/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4}:
+
+stdenv.mkDerivation {
+  name = "akonadi-1.1.1";
+  src = fetchurl {
+    url = http://akonadi.omat.nl/akonadi-1.1.1.tar.bz2;
+    md5 = "2e98b42cec9ec4e60a2e3c096f1a3106";
+  };
+  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 ];
+}
diff --git a/pkgs/desktops/kde-4.2/support/decibel/default.nix b/pkgs/desktops/kde-4.2/support/decibel/default.nix
new file mode 100644
index 0000000000000..dab71739f6a7f
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/support/decibel/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, tapioca_qt, telepathy_qt}:
+
+stdenv.mkDerivation {
+  name = "decibel-0.5.0";
+  src = fetchurl {
+    url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz;
+    md5 = "7de299ace568c87a746388ad765228e5";
+  };
+  buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ];
+}
diff --git a/pkgs/desktops/kde-4.2/support/eigen/default.nix b/pkgs/desktops/kde-4.2/support/eigen/default.nix
new file mode 100644
index 0000000000000..8ad17db3e04c6
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/support/eigen/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake}:
+
+stdenv.mkDerivation {
+  name = "eigen-2.0.0";
+  src = fetchurl {
+    url = http://download.tuxfamily.org/eigen/eigen-2.0.0.tar.bz2;
+    md5 = "bedfe344498b926a4b5db17d2846dbb5";
+  };
+  buildInputs = [ cmake ];  
+}
diff --git a/pkgs/desktops/kde-4.2/support/phonon/default.nix b/pkgs/desktops/kde-4.2/support/phonon/default.nix
index 99b3403f992e8..35bfd838db85f 100644
--- a/pkgs/desktops/kde-4.2/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.2/support/phonon/default.nix
@@ -5,10 +5,10 @@ gst_all, xineLib,
 automoc4}:
 
 stdenv.mkDerivation {
-  name = "phonon-4.3.0";
+  name = "phonon-4.3.1";
   src = fetchurl {
-    url = mirror://kde/stable/phonon/4.3.0/phonon-4.3.0.tar.bz2;
-    md5 = "f851219ec1fb4eadc7904f053b6b498d";
+    url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2;
+    sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
   };
   buildInputs = [ cmake
                   libXau libXdmcp
diff --git a/pkgs/desktops/kde-4.2/support/qca2/default.nix b/pkgs/desktops/kde-4.2/support/qca2/default.nix
new file mode 100644
index 0000000000000..d54c3acd69fb0
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/support/qca2/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, which, qt4}:
+
+stdenv.mkDerivation {
+  name = "qca-2.0.1";
+  src = fetchurl {
+    url = http://delta.affinix.com/download/qca/2.0/qca-2.0.1.tar.bz2;
+    md5 = "a0a87d0b3210e23f8c1713562282b7d6";
+  };
+  buildInputs = [ which qt4 ];
+}
diff --git a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix
new file mode 100644
index 0000000000000..8e3dd70e28064
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4}:
+
+stdenv.mkDerivation {
+  name = "qimageblitz-0.0.4";
+  src = fetchurl {
+    url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2;
+    md5 = "cb87c7f1c0455e8984ee4830f1e749cf";
+  };
+  buildInputs = [ cmake qt4 ];
+}
diff --git a/pkgs/desktops/kde-4.2/support/soprano/default.nix b/pkgs/desktops/kde-4.2/support/soprano/default.nix
index 558c4fd66fb68..87bac0c905069 100644
--- a/pkgs/desktops/kde-4.2/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.2/support/soprano/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4, jdk, cluceneCore, redland}:
 
 stdenv.mkDerivation {
-  name = "soprano-2.2.1";
+  name = "soprano-2.2.3";
   src = fetchurl {
-    url = mirror://sourceforge/soprano/soprano-2.2.1.tar.bz2;
-    md5 = "69688a71273e1e9389fc60e3085c695f";
+    url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2;
+    md5 = "22c992a252144ae0a3a964ba2f6f1933";
   };
   JAVA_HOME=jdk;
   buildInputs = [ cmake qt4 jdk cluceneCore redland ];
diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix
new file mode 100644
index 0000000000000..e1a23ce16cb1c
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/toys/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdetoys-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdetoys-4.2.1.tar.bz2;
+    sha1 = "46157a10a35d37e798faa8bb988ac1c3f2a51f07";
+  };
+  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/utils/builder.sh b/pkgs/desktops/kde-4.2/utils/builder.sh
new file mode 100644
index 0000000000000..c1ec2b7e1cd83
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/utils/builder.sh
@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    for i in printer-applet/cmake-modules/FindSystemConfigPrinter.py printer-applet/printer-applet.py
+    do
+	sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
+    done
+    
+    sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix
new file mode 100644
index 0000000000000..a77c2feed9db6
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/utils/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, cmake, qt4, perl, gmp, python, libzip, libarchive, sip, pyqt4, pycups, system_config_printer, rhpl,
+ kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}:
+
+stdenv.mkDerivation {
+  name = "kdeutils-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdeutils-4.2.1.tar.bz2;
+    sha1 = "2f875d05584b25b928b38e1da2b04c073acefd35";
+  };
+  builder = ./builder.sh;
+  inherit system_config_printer;
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl
+                  kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ];
+}
diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix
new file mode 100644
index 0000000000000..9b06650a40286
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/webdev/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost,
+ kdelibs, kdepimlibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdewebdev-4.2.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.1/src/kdewebdev-4.2.1.tar.bz2;
+    sha1 = "438bef3bb32ce53a83c6f30f65fb49d4d4e7c76a";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
+}