Big kde-related update.

I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965

46 files changed, 193 insertions, 238 deletions

diff --git a/pkgs/desktops/kde-4.3/admin/default.nix b/pkgs/desktops/kde-4.3/admin/default.nix
index 5dd8d30bb215..c5e2d70f7410 100644
--- a/pkgs/desktops/kde-4.3/admin/default.nix
+++ b/pkgs/desktops/kde-4.3/admin/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
   
   includeAllQtDirs=true;
   
-  CMAKE_PREFIX_PATH=kdepimlibs;
   
   buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
                   kdelibs kdepimlibs kdebindings automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix
index 3cf60118372f..82536a21d458 100644
--- a/pkgs/desktops/kde-4.3/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.3/base-workspace/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
     sha1 = "5b43447139d22247d5bc2deee8e3a944447f0bbf";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   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
diff --git a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix
index 925ab0ce48f9..0de8dd5645c9 100644
--- a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext ];
-  CMAKE_PREFIX_PATH = kdepimlibs;
   cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix
index faa82395a9ef..dae7b2a5d099 100644
--- a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
     libxml2 libxslt gettext ];
-  CMAKE_PREFIX_PATH = kdepimlibs;
   cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
index dfe7103b628e..ded87af72400 100644
--- a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
     sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
   }; 
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
                   poppler gsl gmm wv2 libwpd
                   kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
diff --git a/pkgs/desktops/kde-4.3/extragear/konversation/default.nix b/pkgs/desktops/kde-4.3/extragear/konversation/default.nix
index e74cf8f13786..565c3eeb5103 100644
--- a/pkgs/desktops/kde-4.3/extragear/konversation/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/konversation/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
   patchPhase = ''
     echo "include_directories(${qt4}/include/QtGui)" > tmp
diff --git a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
index 970368dc7362..3bc8f66e0984 100644
--- a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
     sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
   buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
                   kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
diff --git a/pkgs/desktops/kde-4.3/network/default.nix b/pkgs/desktops/kde-4.3/network/default.nix
index 0924cb4f1429..6831bb5db1eb 100644
--- a/pkgs/desktops/kde-4.3/network/default.nix
+++ b/pkgs/desktops/kde-4.3/network/default.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
     sha1 = "e066c3642d254e1e8213ef511546e960c5658596";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                   libvncserver tapioca_qt libmsn
 		  libXi libXtst libXdamage libXxf86vm
diff --git a/pkgs/desktops/kde-4.3/pim-runtime/default.nix b/pkgs/desktops/kde-4.3/pim-runtime/default.nix
index ae6fbd669012..2333e27bc08c 100644
--- a/pkgs/desktops/kde-4.3/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.3/pim-runtime/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation {
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
                   kdelibs kdelibs_experimental kdepimlibs
 		  automoc4 phonon akonadi soprano strigi ];
-  CMAKE_PREFIX_PATH=kdepimlibs;
   includeAllQtDirs=true;
   builder = ./builder.sh;
   meta = {
diff --git a/pkgs/desktops/kde-4.3/pim/default.nix b/pkgs/desktops/kde-4.3/pim/default.nix
index 722929fc6dfc..7eb9a8fd7f92 100644
--- a/pkgs/desktops/kde-4.3/pim/default.nix
+++ b/pkgs/desktops/kde-4.3/pim/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
     sha1 = "3ddc34c2b0c96c0273431631ccf47a8b9b4289b3";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   builder = ./builder.sh;  
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
                   shared_mime_info libXScrnSaver
diff --git a/pkgs/desktops/kde-4.3/plasma-addons/default.nix b/pkgs/desktops/kde-4.3/plasma-addons/default.nix
index 5d81922c66b6..296d874fea09 100644
--- a/pkgs/desktops/kde-4.3/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.3/plasma-addons/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation {
   inherit kdebase_workspace;
   builder = ./builder.sh;
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   KDEDIRS="${kdeedu}";
   buildInputs = [ cmake qt4 perl python shared_mime_info
                   kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu
diff --git a/pkgs/desktops/kde-4.3/sdk/default.nix b/pkgs/desktops/kde-4.3/sdk/default.nix
index 62678fd191fa..8cf44b9eb15c 100644
--- a/pkgs/desktops/kde-4.3/sdk/default.nix
+++ b/pkgs/desktops/kde-4.3/sdk/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
     sha1 = "42b6209908f8baadc0add46153649ebdfa9a977a";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   builder=./builder.sh;
   inherit aprutil;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil
diff --git a/pkgs/desktops/kde-4.3/utils/default.nix b/pkgs/desktops/kde-4.3/utils/default.nix
index ced47d57b4a4..cd1f0bf6fa18 100644
--- a/pkgs/desktops/kde-4.3/utils/default.nix
+++ b/pkgs/desktops/kde-4.3/utils/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
   
   includeAllQtDirs=true;
   
-  CMAKE_PREFIX_PATH=kdepimlibs;
   
   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 ];
diff --git a/pkgs/desktops/kde-4.3/webdev/default.nix b/pkgs/desktops/kde-4.3/webdev/default.nix
index 7391bf76aefe..23db40bba54d 100644
--- a/pkgs/desktops/kde-4.3/webdev/default.nix
+++ b/pkgs/desktops/kde-4.3/webdev/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
     sha1 = "697f0557c616497a6f80bbcac472ad6ddd687ae8";
   };
   includeAllQtDirs=true;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
   meta = {
     description = "KDE Web development utilities";
diff --git a/pkgs/desktops/kde-4.4/accessibility/default.nix b/pkgs/desktops/kde-4.4/accessibility/default.nix
index 6185af364f09..e2710bdadd12 100644
--- a/pkgs/desktops/kde-4.4/accessibility/default.nix
+++ b/pkgs/desktops/kde-4.4/accessibility/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeaccessibility-4.3.4";
+  name = "kdeaccessibility-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeaccessibility-4.3.4.tar.bz2;
-    sha1 = "96aa150b8a5c368b6bb36476ed5fb3e3b3c30547";
+    url = mirror://kde/stable/4.4.0/src/kdeaccessibility-4.4.0.tar.bz2;
+    sha256 = "0dkka6rzjd96i7mn8yia6d2mbgnl73jswm2xdnm2d2x9la6hpff3";
   };
   buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/admin/default.nix b/pkgs/desktops/kde-4.4/admin/default.nix
index 403736a18619..e60106a7112a 100644
--- a/pkgs/desktops/kde-4.4/admin/default.nix
+++ b/pkgs/desktops/kde-4.4/admin/default.nix
@@ -3,11 +3,11 @@
 , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeadmin-4.3.4";
+  name = "kdeadmin-4.4.0";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2;
-    sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d";
+    url = mirror://kde/stable/4.4.0/src/kdeadmin-4.4.0.tar.bz2;
+    sha256 = "10gafh9qdi3v2iinbd7a2x28fcz86sd3lyym8gd64q6qq8phgxqy";
   };
   
   builder = ./builder.sh;
@@ -15,7 +15,6 @@ stdenv.mkDerivation {
   inherit system_config_printer;
   
   
-  CMAKE_PREFIX_PATH=kdepimlibs;
   
   buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
                   kdelibs kdepimlibs kdebindings automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.4/artwork/default.nix b/pkgs/desktops/kde-4.4/artwork/default.nix
index 0b06fce00ae6..eb40b1116848 100644
--- a/pkgs/desktops/kde-4.4/artwork/default.nix
+++ b/pkgs/desktops/kde-4.4/artwork/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
 
 stdenv.mkDerivation {
-  name = "kdeartwork-4.3.4";
+  name = "kdeartwork-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeartwork-4.3.4.tar.bz2;
-    sha1 = "7a095932bad297f22b23765ce6ee17bfd2438bf2";
+    url = mirror://kde/stable/4.4.0/src/kdeartwork-4.4.0.tar.bz2;
+    sha1 = "08djygxycrpgn09506lmkm86d1jbl8m0bbi79jdd4q3c1w76dbi4";
   };
   buildInputs = [ cmake qt4 perl xscreensaver
                   kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
diff --git a/pkgs/desktops/kde-4.4/base-runtime/default.nix b/pkgs/desktops/kde-4.4/base-runtime/default.nix
index 502cf0fb87b7..9ca2a4b9e8a2 100644
--- a/pkgs/desktops/kde-4.4/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}:
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.3.4";
+  name = "kdebase-runtime-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdebase-runtime-4.3.4.tar.bz2;
-    sha1 = "871d23457c4a2676704722e2e3b7194d447904ee";
+    url = mirror://kde/stable/4.4.0/src/kdebase-runtime-4.4.0.tar.bz2;
+    sha256 = "1zrwkf2l7nq0z4a9pm2plkynys65h77ai4s3cqlvzwlwhf4l3f1z";
   };
 /*  CLUCENE_HOME=cluceneCore;*/
   buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info
diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix
index 67faeba20a4c..e574862c0bbe 100644
--- a/pkgs/desktops/kde-4.4/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix
@@ -6,12 +6,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.3.4";
+  name = "kdebase-workspace-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdebase-workspace-4.3.4.tar.bz2;
-    sha1 = "5b43447139d22247d5bc2deee8e3a944447f0bbf";
+    url = mirror://kde/stable/4.4.0/src/kdebase-workspace-4.4.0.tar.bz2;
+    sha256 = "16rc4cpq97bfcvj0bmq9k3kv48gjbx8569m7lg3qm91xg8nz79hn";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   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
diff --git a/pkgs/desktops/kde-4.4/base/default.nix b/pkgs/desktops/kde-4.4/base/default.nix
index 0215e9adba39..cece0f8966de 100644
--- a/pkgs/desktops/kde-4.4/base/default.nix
+++ b/pkgs/desktops/kde-4.4/base/default.nix
@@ -3,10 +3,10 @@
 , automoc4, phonon, strigi, qimageblitz, soprano}:
 
 stdenv.mkDerivation {
-  name = "kdebase-4.3.4";
+  name = "kdebase-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdebase-4.3.4.tar.bz2;
-    sha1 = "7f8637367177c93916dfc2e6a2f6323a5e91c6ce";
+    url = mirror://kde/stable/4.4.0/src/kdebase-4.4.0.tar.bz2;
+    sha256 = "0nkl0kacp87livsqdqkqvgwq18mck5jafdz91jc4qhqkcf8p5x4x";
   };
   buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
                   kdebase_workspace automoc4 phonon strigi qimageblitz soprano ];
diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix
index da72593408b7..8d155a60cfe6 100644
--- a/pkgs/desktops/kde-4.4/edu/default.nix
+++ b/pkgs/desktops/kde-4.4/edu/default.nix
@@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, eigen}:
 
 stdenv.mkDerivation {
-  name = "kdeedu-4.3.4";
+  name = "kdeedu-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeedu-4.3.4.tar.bz2;
-    sha1 = "ee646d57db11b761d8da33fc03c596c8f531eb9d";
+    url = mirror://kde/stable/4.4.0/src/kdeedu-4.4.0.tar.bz2;
+    sha256 = "0qc7y361ndpmvjpkdxa7psvx9brx3lhwp5fmm94j6gva7kvyad9d";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
                   kdelibs automoc4 phonon eigen ];
diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
index d5fc2969d6ea..39f30106528e 100644
--- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext ];
-  CMAKE_PREFIX_PATH = kdepimlibs;
   cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix
index 5887e19efafb..59b778668001 100644
--- a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
     libxml2 libxslt gettext ];
-  CMAKE_PREFIX_PATH = kdepimlibs;
   cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
index f0733db28d3b..d859ff688362 100644
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
     sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
   }; 
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
                   poppler gsl gmm wv2 libwpd
                   kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
diff --git a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
index b1a8c43d6ffb..0a5672a33a22 100644
--- a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2;
     sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
   patchPhase = ''
     echo "include_directories(${qt4}/include/QtGui)" > tmp
diff --git a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
index bbe94abb22cb..66f069e5565a 100644
--- a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation {
     url = http://ktorrent.org/downloads/3.3.2/ktorrent-3.3.2.tar.bz2;
     sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
   buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
                   kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
diff --git a/pkgs/desktops/kde-4.4/games/default.nix b/pkgs/desktops/kde-4.4/games/default.nix
index 9383304991bd..d65d2adb2a05 100644
--- a/pkgs/desktops/kde-4.4/games/default.nix
+++ b/pkgs/desktops/kde-4.4/games/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegames-4.3.4";
+  name = "kdegames-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdegames-4.3.4.tar.bz2;
-    sha1 = "33ea8ec476b1557a55c90c071bd462e5ceb7c52b";
+    url = mirror://kde/stable/4.4.0/src/kdegames-4.4.0.tar.bz2;
+    sha256 = "1kg9xnl2vw43wmz2k6pcinp9rs7nfx5r4dmmir5m827xmxr8p9d0";
   };
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/graphics/default.nix b/pkgs/desktops/kde-4.4/graphics/default.nix
index 530501f84651..fe493f9d276f 100644
--- a/pkgs/desktops/kde-4.4/graphics/default.nix
+++ b/pkgs/desktops/kde-4.4/graphics/default.nix
@@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegraphics-4.3.4";
+  name = "kdegraphics-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdegraphics-4.3.4.tar.bz2;
-    sha1 = "bb32171b0d562d5698d4f0526be2b069e99f7448";
+    url = mirror://kde/stable/4.4.0/src/kdegraphics-4.4.0.tar.bz2;
+    sha256 = "0x978k6afzi28gkj9a22h91wjd3ar5wf7ricsq29x659nkp5cw9j";
   };
   buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
                   shared_mime_info stdenv.gcc.libc libXxf86vm
diff --git a/pkgs/desktops/kde-4.4/l10n/default.nix b/pkgs/desktops/kde-4.4/l10n/default.nix
index 837d2b10f0b7..d3be25f909f9 100644
--- a/pkgs/desktops/kde-4.4/l10n/default.nix
+++ b/pkgs/desktops/kde-4.4/l10n/default.nix
@@ -4,7 +4,7 @@
 let
 
   deriv = attr : stdenv.mkDerivation {
-    name = "kde-l10n-${attr.lang}-4.3.4";
+    name = "kde-l10n-${attr.lang}-4.4.0";
     src = fetchurl {
       url = attr.url;
       sha256 = attr.sha256;
@@ -23,356 +23,344 @@ in
 
   ar = deriv {
     lang = "ar";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ar-4.3.4.tar.bz2";
-    sha256 = "0dgk97j0qv8qxfhiwv0cwqbmfgnxn0k7znm7vd40ngblbp4k75y1";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ar-4.4.0.tar.bz2";
+    sha256 = "0a4s8xhbbmchhdsf139dvl9z27rkzjz2xf8c6wj95mc9fi1mzrsh";
   };
 
   bg = deriv {
     lang = "bg";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bg-4.3.4.tar.bz2";
-    sha256 = "13mshqlskqndfm20s07978300p5ik432krhdk9k5a049f7w543dp";
-  };
-
-  bn_IN = deriv {
-    lang = "bn_IN";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bn_IN-4.3.4.tar.bz2";
-    sha256 = "0zh7zra2si0z966r8qq41m3g4l9864acfg70hjbgr4bhvhn642zd";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-bg-4.4.0.tar.bz2";
+    sha256 = "00xhn5vdsxv2q63r8944ik51xilzi5q69wpj2358nn6xz5pwjq7z";
   };
 
   ca = deriv {
     lang = "ca";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ca-4.3.4.tar.bz2";
-    sha256 = "1ry403z9qgimcj8nilznr0f7bkviybcpwm3clww13na74ngmz4a1";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ca-4.4.0.tar.bz2";
+    sha256 = "1r2b5gh13wim3xpwbs17nf3llkfb5v143jcrgwz005l9fhi0mzv2";
   };
 
   cs = deriv {
     lang = "cs";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-cs-4.3.4.tar.bz2";
-    sha256 = "1gd0rl0c59fawd7s20nrmnc5vr915aqhz7f57wrgpw2kxgva33nk";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-cs-4.4.0.tar.bz2";
+    sha256 = "1wbwk8g2661sygk7jjnsjfnmzv1zl1y6509qw6bkdikn3xd9v0wk";
   };
 
   csb = deriv {
     lang = "csb";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-csb-4.3.4.tar.bz2";
-    sha256 = "02b8341cpgzbp4ijnzs8bkvynz9mhz18ma5yk66i9q0js6rk8bn2";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-csb-4.4.0.tar.bz2";
+    sha256 = "1vi6a4y1kgi1dlzzvvskdgcal1s0sfz4nbk46y92l3gnlmmkfzd1";
   };
 
   da = deriv {
     lang = "da";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-da-4.3.4.tar.bz2";
-    sha256 = "1r7kn5qdcx64p0rlj9mb3011hk5rvrqzvr8k6nrfsfmw2h7mnjym";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-da-4.4.0.tar.bz2";
+    sha256 = "1yxv76fvla1ba7v5zgbxsq0v6qfbcx96k2znaqi6055zzrymhf8k";
   };
 
   de = deriv {
     lang = "de";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-de-4.3.4.tar.bz2";
-    sha256 = "0nclr4chx2ir036fjhs7zp2l1k43vn11lww7338v2nn9mcwfdyn3";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-de-4.4.0.tar.bz2";
+    sha256 = "1kgv76vba5dhqhhg24hjl43kf2pd80h6plpf17p547k071xpfnw2";
   };
 
   el = deriv {
     lang = "el";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-el-4.3.4.tar.bz2";
-    sha256 = "104ycjq95zhkv2by36lndqc2w2shn3dp386ir5wj52x4f26j1zd0";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-el-4.4.0.tar.bz2";
+    sha256 = "1hw652vr4d5djsxgy7hp0kjshg55zxdqski5gg2haj2wzr7y5l6r";
   };
 
   en_GB = deriv {
     lang = "en_GB";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-en_GB-4.3.4.tar.bz2";
-    sha256 = "044s656x90xdgp14cddsz499bxfhsscnngvx4q13pnxrd2gbr2xj";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-en_GB-4.4.0.tar.bz2";
+    sha256 = "11xgnpvvarkji7lgwvnhxf1jz4819881hpn1532w8xrynj9nky21";
+  };
+
+  eo = deriv {
+    lang = "eo";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-eo-4.4.0.tar.bz2";
+    sha256 = "1mdgm2fr0pqi2g4p5jpwgd1jrmmzi1qqxfna0dasfmy2nqsqf2bz";
   };
 
   es = deriv {
     lang = "es";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-es-4.3.4.tar.bz2";
-    sha256 = "0fx40sx0cqjashlj9z9da2jndwbg6s36njsgsx6kjfd90p23snvi";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-es-4.4.0.tar.bz2";
+    sha256 = "0gaxnriw699mdp4j50jf8g46yaw08rzm4gp4211ikd4hs6w1vz12";
   };
 
   et = deriv {
     lang = "et";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-et-4.3.4.tar.bz2";
-    sha256 = "08s9y9h9qx2ahz1chmlcycldmf543c0kc8wfrsryrf1iaajdma0r";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-et-4.4.0.tar.bz2";
+    sha256 = "1ds404baq6al0240czlvvz52dlsl628kam0lamfw4b4fbkp7khdw";
   };
 
   eu = deriv {
     lang = "eu";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-eu-4.3.4.tar.bz2";
-    sha256 = "1q0vjvbc6lywpqzizi61cz91scrkjplxjp2jywyi6dnrv475w6b9";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-eu-4.4.0.tar.bz2";
+    sha256 = "1knh3rz1yqwsz6xjrs4xn80p2kl0ydjhwv6rgd3ll6gqqq274rnf";
   };
 
   fi = deriv {
     lang = "fi";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fi-4.3.4.tar.bz2";
-    sha256 = "1z2jmcmr46f0a5hins4hkj843r3bd6azykiz6nwwkgk7png21axm";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-fi-4.4.0.tar.bz2";
+    sha256 = "1x2d5wlyvg3m8dj4prmfy77qg0674b3xlj35q5l8avp2knzsib1s";
   };
 
   fr = deriv {
     lang = "fr";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fr-4.3.4.tar.bz2";
-    sha256 = "07fi4c7k9h69m5jacp0vlyd268gxljh2j3hj9fk5vka4333rp2x0";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-fr-4.4.0.tar.bz2";
+    sha256 = "0ccyw7gnv9dcsb8cgydmrn675w3dhr012zm0zyxxv9h2mgaia5kj";
   };
 
   fy = deriv {
     lang = "fy";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fy-4.3.4.tar.bz2";
-    sha256 = "1l22bjccdxnsqgsns3nbh5wwplacbjgxhw72lvysnc3c7kkjm789";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-fy-4.4.0.tar.bz2";
+    sha256 = "0kjgxq90ng410zp19b2j3b9k5rz9ad1g1zgxv8xmvjfvdzj5ycs4";
   };
 
   ga = deriv {
     lang = "ga";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ga-4.3.4.tar.bz2";
-    sha256 = "1kkz7gsyfpzrvy7pg2gajw24jybr8crk5yighp9mqa337cqjma6z";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ga-4.4.0.tar.bz2";
+    sha256 = "1a7dyn1ly6n6gnxh5kvwim5yf1mj4ynlj6jlmgfxki4y6mlqhdp5";
   };
 
   gl = deriv {
     lang = "gl";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gl-4.3.4.tar.bz2";
-    sha256 = "161dh3w3jwrlzk83is3v25nvaxi5441n3q3bp6kg1fc1jqsinyr0";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-gl-4.4.0.tar.bz2";
+    sha256 = "09w81016dkhmm32jbgcfmy05895kbfj0f7s26g57ahnscfr11sz3";
   };
 
   gu = deriv {
     lang = "gu";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gu-4.3.4.tar.bz2";
-    sha256 = "1i69ma0cw85rf0gxa1wzlbmdhqm3lzyk1br4m4m6iz68am61pkdr";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-gu-4.4.0.tar.bz2";
+    sha256 = "0rgq789mr0phwm7xxwkazkqp1xqikijxan3qvznb3yn6nf4qbgqk";
   };
 
   he = deriv {
     lang = "he";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-he-4.3.4.tar.bz2";
-    sha256 = "0353x14wmh9r1q46vcn2m9sp6fvrfzkj55v0kh0xbh4jdprw8cpn";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-he-4.4.0.tar.bz2";
+    sha256 = "0l18f6qjhkm9bjd8dv4nr3bv895s2jp4zch19pysxxigqpxhd2y6";
   };
 
   hi = deriv {
     lang = "hi";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hi-4.3.4.tar.bz2";
-    sha256 = "1wing32i5f12qn3w6f4zlf7dwvarf8wwzxxvb1jjld16m7vxkksx";
-  };
-
-  hne = deriv {
-    lang = "hne";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hne-4.3.4.tar.bz2";
-    sha256 = "149nahrhybv8cyxdqwdj7p787vsh902yr73r7a0l1sjblisrx84g";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-hi-4.4.0.tar.bz2";
+    sha256 = "16ah2g37hglhgsl48xc46xig0aa5aka7lwzfkmchnb9cn6jn9lqr";
   };
 
   hr = deriv {
     lang = "hr";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hr-4.3.4.tar.bz2";
-    sha256 = "0wg2qahvz8lanv4kqp5128paja7sai68prbincfgfwbi4xdbkfnq";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-hr-4.4.0.tar.bz2";
+    sha256 = "1p46zbf98lwh50gs5lb926wgkx3lxwcirnnax970d1xk94ym4c03";
   };
 
   hu = deriv {
     lang = "hu";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hu-4.3.4.tar.bz2";
-    sha256 = "05vkqxrw3rxb2brm3ggb600al1ggrv739qdfc1m659m1qxhnxgjw";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-hu-4.4.0.tar.bz2";
+    sha256 = "1xrsw13acvjw9s1qfwhnk8sr2bzj8jn3q2bkqpkwiycp8xsc34qw";
+  };
+
+  id = deriv {
+    lang = "id";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-id-4.4.0.tar.bz2";
+    sha256 = "0nln6zminkq2b23wbldgdfc0hjkzl4lh8l86hp5bs2xyhjq9sspj";
   };
 
   is = deriv {
     lang = "is";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-is-4.3.4.tar.bz2";
-    sha256 = "0212ymk3h58bmhaccprn5wfs65fhcpaq73dnqp3v0xmgkfnz6dhy";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-is-4.4.0.tar.bz2";
+    sha256 = "0zrdirkgj5x63xp5w45f5ddl4w8fyxfqzw77pf7cj0ciczmaxr1q";
   };
 
   it = deriv {
     lang = "it";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-it-4.3.4.tar.bz2";
-    sha256 = "0h72ln0jwizxg86kwk6m1zi1wws14prv9xvlzhbmyvcb0sa98v75";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-it-4.4.0.tar.bz2";
+    sha256 = "1dmnn62qp6ysxhxjx55pa0dz9qa4anmi3bnnncypq3sxbpc3wili";
   };
 
   ja = deriv {
     lang = "ja";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ja-4.3.4.tar.bz2";
-    sha256 = "0nw4ybl429y3d9d58y13gyaxzrkrvjgxz4vn68ryn8vlb8d0sb6j";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ja-4.4.0.tar.bz2";
+    sha256 = "0dq7h87gw87vb6d4ld9dvn0msjrzw8v7ns44gsfb7ww21hmghivb";
   };
 
   kk = deriv {
     lang = "kk";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kk-4.3.4.tar.bz2";
-    sha256 = "01j28srx3vbgs8l0vv30fx3ki05i18ddf6sg2jqdli4ylg517l66";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-kk-4.4.0.tar.bz2";
+    sha256 = "0ynahrjal7xc9l5wdcihb4vjbgsf3sxpraavmdii902jsjqnwi74";
   };
 
   km = deriv {
     lang = "km";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-km-4.3.4.tar.bz2";
-    sha256 = "1zdbvgn1lz9lyzrkhjf05k7n1cpdjwzv1v62aja7h438qn8scqnh";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-km-4.4.0.tar.bz2";
+    sha256 = "1zb2p32frmx96hvzh9ln3k6v59pps55g890f919559zk7smglwgb";
   };
 
   kn = deriv {
     lang = "kn";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kn-4.3.4.tar.bz2";
-    sha256 = "193ibxndpgl400djlggwsy6h3mjdkhmvmc5dalh9h2k3fz9fdswn";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-kn-4.4.0.tar.bz2";
+    sha256 = "0xbpw1z8j73psj0bhyry9srbpshy8wz4l61dqdgcdb7yczf865jl";
   };
 
   ko = deriv {
     lang = "ko";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ko-4.3.4.tar.bz2";
-    sha256 = "1888mwknd4l8rcs01w1mi7147cl9phylxjpcsmg3gda61pq12035";
-  };
-
-  ku = deriv {
-    lang = "ku";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ku-4.3.4.tar.bz2";
-    sha256 = "1w70dc75k6s8mpn1fraz1znknfz6cpdbb96frh611fz3r3hzgaix";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ko-4.4.0.tar.bz2";
+    sha256 = "1py0x86sz291as581vzyf1mk38p50jqwcbknc44vg98r6b83hf4m";
   };
 
   lt = deriv {
     lang = "lt";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lt-4.3.4.tar.bz2";
-    sha256 = "098cw3hz9w0kb2b33p5qwxli4z38qw4rcby4j75hwm66l6fw9iqk";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-lt-4.4.0.tar.bz2";
+    sha256 = "00vax8lv0z6gjrsd4j4fw6h5ica3gwwrflihkws7cs94cbgjchd3";
   };
 
   lv = deriv {
     lang = "lv";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lv-4.3.4.tar.bz2";
-    sha256 = "08rfi68mz8iarmscvnn11b1gyr7k2j0gyhs7673gnk5m3avmz2ab";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-lv-4.4.0.tar.bz2";
+    sha256 = "1savmh000g07yg30j5p6jfvgv3aj96jdf8nnjbw26rvh12vi3caa";
   };
 
   mai = deriv {
     lang = "mai";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mai-4.3.4.tar.bz2";
-    sha256 = "0pkad1rchrra15jjij4r76xy26zkmshm80amqfn8ba9nabxr7nxa";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-mai-4.4.0.tar.bz2";
+    sha256 = "1lycsmk047k7v0yknhc826xgycsfx7pjnxg693fk4prh75nj0v3k";
   };
 
   mk = deriv {
     lang = "mk";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mk-4.3.4.tar.bz2";
-    sha256 = "041iw3754j5x6b02yzk6zyy0fggmx1lq1kgv1d3g5nxv2a4dp311";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-mk-4.4.0.tar.bz2";
+    sha256 = "0fglnhrwrsyxf9zq3ckd6kdqh8m6gcqw2kh95h8qc8fl8gxskmn9";
   };
 
   ml = deriv {
     lang = "ml";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ml-4.3.4.tar.bz2";
-    sha256 = "0y6050gb5vrlpbimackzzpsv08j8zxp67cg2gdn4x0v31xpvpxfr";
-  };
-
-  mr = deriv {
-    lang = "mr";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mr-4.3.4.tar.bz2";
-    sha256 = "08asxp8g0qijla04m29lb16544gdibk6d4vf92zmcsff04a1wis2";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ml-4.4.0.tar.bz2";
+    sha256 = "0ivyy3ixj2z9j6np3vcapazgjs4nz0mxxlx74vp9fr9bskka9f4y";
   };
 
   nb = deriv {
     lang = "nb";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nb-4.3.4.tar.bz2";
-    sha256 = "179p6ha1py6j9rinzknqqcr8p062x3g9jz2m160vklsc780y1whw";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-nb-4.4.0.tar.bz2";
+    sha256 = "1mmccv5kpfl5p31jymmhb27x5s6xj53kps7n6nfj3r7k6k66iszi";
   };
 
   nds = deriv {
     lang = "nds";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nds-4.3.4.tar.bz2";
-    sha256 = "144rsvkw2qr4cd8zh0sxpvnc3rh17i23l3pxhpk65ldq6b7xnybb";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-nds-4.4.0.tar.bz2";
+    sha256 = "090gz9jzsjmwr01ms98ilcrh97jh0ydprx5dg6ra5sd27h53qg2p";
   };
 
   nl = deriv {
     lang = "nl";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nl-4.3.4.tar.bz2";
-    sha256 = "15gnqpg7blc3aj2pdj5pswmimlyhic18jqrlgjk3xsxq4744r4wc";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-nl-4.4.0.tar.bz2";
+    sha256 = "19r76d56vbmhcg340gsxx27la9j5y5lp1f736j4c0bgpwx4ryagk";
   };
 
   nn = deriv {
     lang = "nn";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nn-4.3.4.tar.bz2";
-    sha256 = "0414fmkm19n5bjvbdcxh9vkn0hmpk3w2r60lvm7gmpi8zdak0p2p";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-nn-4.4.0.tar.bz2";
+    sha256 = "1cmq22mc46g9nh3bmzw4b62alkk0i2hib9hg9vammpdmscxqlapl";
   };
 
   pa = deriv {
     lang = "pa";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pa-4.3.4.tar.bz2";
-    sha256 = "0974jsd3l70ygipzf0fv5zvs9ykyn4c6dnm9gf0krdzxskrimfxp";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-pa-4.4.0.tar.bz2";
+    sha256 = "0ngqnbxavj1r92njymx645a2rfdp7xmsrhd2n0glhix4x3lc7k1a";
   };
 
   pl = deriv {
     lang = "pl";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pl-4.3.4.tar.bz2";
-    sha256 = "0f5hr7mff4a8hpwapz67wjlg02jwdnainaa8jk2j64lwzbswybyr";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-pl-4.4.0.tar.bz2";
+    sha256 = "111zcsqw42h9pyxr82mkh5jkckv5803n37731yh7zphsqdrr0fz4";
   };
 
   pt = deriv {
     lang = "pt";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt-4.3.4.tar.bz2";
-    sha256 = "07bclil0lhr59faqr8a59bfmvsdjla0pg0x0a4qqmnqhhan1ki3p";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-pt-4.4.0.tar.bz2";
+    sha256 = "15ad2qp5667cvfg6b39d37nd4hashfrn9448awlwr4vkk6fkwfr6";
   };
 
   pt_BR = deriv {
     lang = "pt_BR";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt_BR-4.3.4.tar.bz2";
-    sha256 = "03y3fk1b2yzp6jbaic76y06522wbq3lzxf1pbc5xi22q3gw14dls";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-pt_BR-4.4.0.tar.bz2";
+    sha256 = "1yax60mipr60ixwwv1wqq31qbc1pzq193fywqsjsjhp2vycnslsq";
   };
 
   ro = deriv {
     lang = "ro";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ro-4.3.4.tar.bz2";
-    sha256 = "0nqdl8jbr29bjdvxdppbmjjgamh68gcg38j8gsh5zp6ak1ac2abc";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ro-4.4.0.tar.bz2";
+    sha256 = "19a77nsk3y0abr9csklwb3q1fbyy2gqfvxa4yhkba54055h55sfq";
   };
 
   ru = deriv {
     lang = "ru";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ru-4.3.4.tar.bz2";
-    sha256 = "0n5g26p98dshngv35izfc826ahirqppx4ig6ycj9pfza5aakajah";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-ru-4.4.0.tar.bz2";
+    sha256 = "0d1vsvxqp9a8w0mpsw99hsv3am6iga2v5v2zyizcm4vd1997ycn8";
+  };
+
+  si = deriv {
+    lang = "si";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-si-4.4.0.tar.bz2";
+    sha256 = "1gm8kx2qqwgaj7wsjwpvhiqiw0aw3ics7l9mp25ai04vs140axfq";
   };
 
   sk = deriv {
     lang = "sk";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sk-4.3.4.tar.bz2";
-    sha256 = "0jwh0sx09hxz922snak4jxajcl1p3rciycwqw4fgmk6fx5ra7s48";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-sk-4.4.0.tar.bz2";
+    sha256 = "11wq3z3nrh0am477izs4w0fgpzq7ha106286na3p2z7izzfyfh0k";
   };
 
   sl = deriv {
     lang = "sl";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sl-4.3.4.tar.bz2";
-    sha256 = "063lbb2g5zpg3330hz749m5kh9hx8xrf7ifj95xjkbkh1sa0g2dm";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-sl-4.4.0.tar.bz2";
+    sha256 = "092f7sy5dn0zngvsvifrapb6k40xqcj14qrq0bf2vqlf0a18q78i";
   };
 
   sr = deriv {
     lang = "sr";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sr-4.3.4.tar.bz2";
-    sha256 = "121vdrzk9fm30s8q4m5b7vd3lv3n4azzx7dm62qx84qyx9zs8r4y";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-sr-4.4.0.tar.bz2";
+    sha256 = "0p7nnnzsm83jajwk8f080p0wkqybsnh17zim9g31yiji0d44bqbw";
   };
 
   sv = deriv {
     lang = "sv";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sv-4.3.4.tar.bz2";
-    sha256 = "192yw9vjwv9s7bdmcndqq0dx0g6djpjbyiq9skpzpq21zphgf0n1";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-sv-4.4.0.tar.bz2";
+    sha256 = "1h2aip645l50pxadv5sa8gamd9wdvzl6yahgmw81k9fqkh48qqk6";
   };
 
   tg = deriv {
     lang = "tg";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tg-4.3.4.tar.bz2";
-    sha256 = "0q90k5fk6f41baiyxl3055y6b55nx7plq7hzlkp1h2d60q2d8yhs";
-  };
-
-  th = deriv {
-    lang = "th";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-th-4.3.4.tar.bz2";
-    sha256 = "00jc6dkhpcxc95jkg7v1fsgn2ymk38mqs0h8x1an23jgs5sbl43r";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-tg-4.4.0.tar.bz2";
+    sha256 = "10izjnp71bgmawjhslwqzixppzkfxi9gj52r705k2y317z548lgl";
   };
 
   tr = deriv {
     lang = "tr";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tr-4.3.4.tar.bz2";
-    sha256 = "1igr4fw1h3617kyqhxdgg798k1gdiwxz5g2s59g281vm16r3rg01";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-tr-4.4.0.tar.bz2";
+    sha256 = "11ccp03yscad0drd11mlvsyw9b72sjh076vlbfi6j97bnvm1cgrx";
   };
 
   uk = deriv {
     lang = "uk";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-uk-4.3.4.tar.bz2";
-    sha256 = "0sir7ayb2ydrhl5dbq9ni10l2w45blh9pdd7bpfxmgqz7n1kylp8";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-uk-4.4.0.tar.bz2";
+    sha256 = "18q2q4s2hv2bzxj7hxl5grjnns9hjsqikybq3icp7pixsdgqadxd";
   };
 
   wa = deriv {
     lang = "wa";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-wa-4.3.4.tar.bz2";
-    sha256 = "0ip3idiq6sfxzgg872sjw9ra1sy137q9m47ik3fdfcxgfwv7bj1r";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-wa-4.4.0.tar.bz2";
+    sha256 = "13zmfw2v2rqqi6mpk8zhkniyvbji6c7d7njkm87wlifz1sz4svnk";
   };
 
   zh_CN = deriv {
     lang = "zh_CN";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_CN-4.3.4.tar.bz2";
-    sha256 = "0c8m6zj3pzr0pkmb6m3h6a5n274s2v8wpp7gfqkxrkardq0scwxb";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-zh_CN-4.4.0.tar.bz2";
+    sha256 = "0pbgy20434365sywzq58syi2bsqh6pvdb8adg1lmaqfy5na60s9z";
   };
 
   zh_TW = deriv {
     lang = "zh_TW";
-    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_TW-4.3.4.tar.bz2";
-    sha256 = "1xiav7nhvkfpizih845z1cr8avkphvszd4j8i547lcb8xnvvk0bw";
+    url = "mirror://kde/stable/4.4.0/src/kde-l10n/kde-l10n-zh_TW-4.4.0.tar.bz2";
+    sha256 = "190r44x834c0hrbilvx5x0901jm6dqpmsc76gxdbvfkq563x0yr9";
   };
 
 }
diff --git a/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl b/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl
index 6f2113c9cce8..5eaa994e78ca 100755
--- a/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl
+++ b/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl
@@ -2,7 +2,7 @@
 
 # Typical command to generate the list of tarballs:
 
-# export i="mirror://kde/stable/4.3.4/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
+# export i="mirror://kde/stable/4.4.0/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
 # manually update extra.list
 # then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
 
@@ -63,7 +63,7 @@ print OUT <<EOF;
 let
 
   deriv = attr : stdenv.mkDerivation {
-    name = "kde-l10n-\${attr.lang}-4.3.4";
+    name = "kde-l10n-\${attr.lang}-4.4.0";
     src = fetchurl {
       url = attr.url;
       sha256 = attr.sha256;
diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix
index 08e17ee9b8c3..bd0d76febf86 100644
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ shared_desktop_ontologies ];
 
-  CMAKE_PREFIX_PATH=shared_desktop_ontologies;
 
   # I don't know why cmake does not find the acl files (but finds attr files)
   cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ];
diff --git a/pkgs/desktops/kde-4.4/multimedia/default.nix b/pkgs/desktops/kde-4.4/multimedia/default.nix
index 53f77b594aab..e6c497318969 100644
--- a/pkgs/desktops/kde-4.4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.4/multimedia/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, kdelibs_experimental, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.3.4";
+  name = "kdemultimedia-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdemultimedia-4.3.4.tar.bz2;
-    sha1 = "cf8f2696267ec682ee48fbb0f6171d9e9f7aa4b3";
+    url = mirror://kde/stable/4.4.0/src/kdemultimedia-4.4.0.tar.bz2;
+    sha256 = "0zvllvwj2nj7qh9jq5048d37jj55cml7d0y1k4rk1ba31mmp7vrn";
   };
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
                   kdelibs kdelibs_experimental automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix
index c6b47cfffb3a..042070461565 100644
--- a/pkgs/desktops/kde-4.4/network/default.nix
+++ b/pkgs/desktops/kde-4.4/network/default.nix
@@ -4,12 +4,11 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.3.4";
+  name = "kdenetwork-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdenetwork-4.3.4.tar.bz2;
-    sha1 = "e066c3642d254e1e8213ef511546e960c5658596";
+    url = mirror://kde/stable/4.4.0/src/kdenetwork-4.4.0.tar.bz2;
+    sha256 = "1y1qlig3fjnppn5qc6skfzf783wwchz8hh95kgqh112zwbmslvxi";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                   libvncserver tapioca_qt libmsn
 		  libXi libXtst libXdamage libXxf86vm
diff --git a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
index 3af87b34e018..aaccd2b76735 100644
--- a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake}:
 
 stdenv.mkDerivation {
-  name = "oxygen-icons-4.3.4";
+  name = "oxygen-icons-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/oxygen-icons-4.3.4.tar.bz2;
-    sha1 = "9905f6b5a47db85c05f7387a75b6ae0e0fdd756e";
+    url = mirror://kde/stable/4.4.0/src/oxygen-icons-4.4.0.tar.bz2;
+    sha256 = "1y50hvr2chb8ng673skynra4m7ka644phwwyg8609ac03jbbg80j";
   };
   buildInputs = [ cmake ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/pim-runtime/default.nix b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
index 60c77477039c..d8bf0393be29 100644
--- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
@@ -3,15 +3,14 @@
 , automoc4, phonon, akonadi, soprano, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdepim-runtime-4.3.4";
+  name = "kdepim-runtime-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdepim-runtime-4.3.4.tar.bz2;
-    sha1 = "bef70088aec4355f5bb8c0375082388eaa3d4b26";
+    url = mirror://kde/stable/4.4.0/src/kdepim-runtime-4.4.0.tar.bz2;
+    sha256 = "1nfzxhc2la8p4nhgbrngqz3a5ymz9783nqpl82y7dsawbn7il2z1";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
                   kdelibs kdelibs_experimental kdepimlibs
 		  automoc4 phonon akonadi soprano strigi ];
-  CMAKE_PREFIX_PATH=kdepimlibs;
   builder = ./builder.sh;
   meta = {
     description = "KDE PIM runtime";
diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix
index 3eb80e88dbda..a2231ee2c180 100644
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@@ -3,12 +3,11 @@
 , kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdepim-4.3.4";
+  name = "kdepim-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2;
-    sha1 = "3ddc34c2b0c96c0273431631ccf47a8b9b4289b3";
+    url = mirror://kde/stable/4.4.0/src/kdepim-4.4.0.tar.bz2;
+    sha256 = "1508c7nsdcp0q7xwsw915kpz7isa37n1v2ahvc4wvxlpn2xrw406";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   builder = ./builder.sh;  
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
                   shared_mime_info libXScrnSaver
diff --git a/pkgs/desktops/kde-4.4/pimlibs/default.nix b/pkgs/desktops/kde-4.4/pimlibs/default.nix
index d111f7766a7a..3b76f4c04e92 100644
--- a/pkgs/desktops/kde-4.4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.4/pimlibs/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, akonadi}:
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-4.3.4";
+  name = "kdepimlibs-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdepimlibs-4.3.4.tar.bz2;
-    sha1 = "4f7cd55999e82f504e3766b6f360ae58b984d5cb";
+    url = mirror://kde/stable/4.4.0/src/kdepimlibs-4.4.0.tar.bz2;
+    sha256 = "1lps1a3p5pzpqgcg5qglfx33q3mn31ss0l8hh83wkg0gvnw1c9sl";
   };
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info
                   kdelibs automoc4 phonon akonadi ];
diff --git a/pkgs/desktops/kde-4.4/plasma-addons/default.nix b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
index 7e1e704362e4..d6140f513d69 100644
--- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
@@ -3,14 +3,13 @@
 , automoc4, phonon, soprano, eigen, qimageblitz}:
 
 stdenv.mkDerivation {
-  name = "kdeplasma-addons-4.3.4";
+  name = "kdeplasma-addons-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeplasma-addons-4.3.4.tar.bz2;
-    sha1 = "0b7af5db24fd194dd5fbbe1690d4ea62f597b891";
+    url = mirror://kde/stable/4.4.0/src/kdeplasma-addons-4.4.0.tar.bz2;
+    sha256 = "1kljvjdq377n3rsbqprifvpyp9qcy4d4rhda8nxk0a9l7dsnw1sh";
   };
   inherit kdebase_workspace;
   builder = ./builder.sh;
-  CMAKE_PREFIX_PATH=kdepimlibs;
   KDEDIRS="${kdeedu}";
   buildInputs = [ cmake qt4 perl python shared_mime_info
                   kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu
diff --git a/pkgs/desktops/kde-4.4/sdk/default.nix b/pkgs/desktops/kde-4.4/sdk/default.nix
index 076ed366f156..8f7040e9462d 100644
--- a/pkgs/desktops/kde-4.4/sdk/default.nix
+++ b/pkgs/desktops/kde-4.4/sdk/default.nix
@@ -2,12 +2,11 @@
 , kdelibs, kdepimlibs, automoc4, phonon, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdesdk-4.3.4";
+  name = "kdesdk-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdesdk-4.3.4.tar.bz2;
-    sha1 = "42b6209908f8baadc0add46153649ebdfa9a977a";
+    url = mirror://kde/stable/4.4.0/src/kdesdk-4.4.0.tar.bz2;
+    sha256 = "17wibrfj7pvvb9vhkz060qvb2r02kdm4vdzz4hfxn6b9ga4znlhf";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   builder=./builder.sh;
   inherit aprutil;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil
diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
index 6ea972c57ad1..8e0db47ac7a0 100644
--- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation {
     url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2;
     sha256 = "1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb";
   };
-  patchPhase = ''
-    cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules
-  '';
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   meta = {
     description = "KDE PIM Storage Service";
diff --git a/pkgs/desktops/kde-4.4/support/phonon/default.nix b/pkgs/desktops/kde-4.4/support/phonon/default.nix
index 8d139a4a8daa..831dd5339f17 100644
--- a/pkgs/desktops/kde-4.4/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.4/support/phonon/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2;
     sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
   meta = {
     description = "KDE Multimedia API";
diff --git a/pkgs/desktops/kde-4.4/support/strigi/default.nix b/pkgs/desktops/kde-4.4/support/strigi/default.nix
index 1f75620a2b12..93778e7c9841 100644
--- a/pkgs/desktops/kde-4.4/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/strigi/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
     sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
   };
-
+  includeAllQtDirs=true;
   
   CLUCENE_HOME = cluceneCore;
   
diff --git a/pkgs/desktops/kde-4.4/toys/default.nix b/pkgs/desktops/kde-4.4/toys/default.nix
index ec2cc6216260..5003e15100c2 100644
--- a/pkgs/desktops/kde-4.4/toys/default.nix
+++ b/pkgs/desktops/kde-4.4/toys/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdetoys-4.3.4";
+  name = "kdetoys-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdetoys-4.3.4.tar.bz2;
-    sha1 = "96f6121990590acd3fb5b8cae25ef98b5572733c";
+    url = mirror://kde/stable/4.4.0/src/kdetoys-4.4.0.tar.bz2;
+    sha256 = "1z9nsgvyazw29rj0g0l7sslda6k79wlb6q8a2q6fcgpzlylnpa0k";
   };
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/utils/default.nix b/pkgs/desktops/kde-4.4/utils/default.nix
index b9c5663f6ac3..c4af85eb3f21 100644
--- a/pkgs/desktops/kde-4.4/utils/default.nix
+++ b/pkgs/desktops/kde-4.4/utils/default.nix
@@ -3,20 +3,17 @@
 , kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdeutils-4.3.4";
+  name = "kdeutils-4.4.0";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdeutils-4.3.4.tar.bz2;
-    sha1 = "2d5e26055e364af2df7459cdbc3aebdc3a8abdea";
+    url = mirror://kde/stable/4.4.0/src/kdeutils-4.4.0.tar.bz2;
+    sha256 = "0js3gylqrwphk1jbaiak4r8l4ak5nrzrvis6kdxxllqr65bmqkxn";
   };
   
   builder = ./builder.sh;
   
   inherit system_config_printer;
   
-  
-  CMAKE_PREFIX_PATH=kdepimlibs;
-  
   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 ];
                   
diff --git a/pkgs/desktops/kde-4.4/webdev/default.nix b/pkgs/desktops/kde-4.4/webdev/default.nix
index 89463dbcd364..8fcb09d49c8f 100644
--- a/pkgs/desktops/kde-4.4/webdev/default.nix
+++ b/pkgs/desktops/kde-4.4/webdev/default.nix
@@ -2,12 +2,11 @@
 , kdelibs, kdepimlibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdewebdev-4.3.4";
+  name = "kdewebdev-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdewebdev-4.3.4.tar.bz2;
-    sha1 = "697f0557c616497a6f80bbcac472ad6ddd687ae8";
+    url = mirror://kde/stable/4.4.0/src/kdewebdev-4.4.0.tar.bz2;
+    sha256 = "04ikga4nwzajdq8b1hv7kkf3lg7yn1klq51q00q869yh60wdi9i2";
   };
-  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
   meta = {
     description = "KDE Web development utilities";
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 892af7735187..49a4ad7fd90d 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -1,7 +1,6 @@
 addCMakeParams()
 {
-    addToSearchPath CMAKE_INCLUDE_PATH $1/include
-    addToSearchPath CMAKE_LIBRARY_PATH $1/lib
+    addToSearchPath CMAKE_PREFIX_PATH $1
     addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules
 }