diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4/base/default.nix
index 75dbfbf40d4..6013a507e3a 100644
--- a/pkgs/desktops/kde-4/base/default.nix
+++ b/pkgs/desktops/kde-4/base/default.nix
@@ -1,14 +1,12 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-4.0beta4";
-  #builder = ./builder.sh;
-  
+  name = "kdebase-4.0rc2";
+
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdebase-3.95.0.tar.bz2;
-    sha256 = "0qf7bn5jqj70hznjk74vpwb7rvk6f5gx9fxwli930b2hskib3zll";
+    url = mirror://kde/unstable/3.97/src/kdebase-3.97.0.tar.bz2;
+    sha256 = "1iavkzfq7f9308j2r70xd6qfng0fncpww8s49hbigzkkdzrjk8gn";
   };
 
   propagatedBuildInputs = [kdepimlibs libusb];
-  inherit kdelibs;
 }
diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4/default.nix
index 9732d9e2b2b..3e96185beed 100644
--- a/pkgs/desktops/kde-4/default.nix
+++ b/pkgs/desktops/kde-4/default.nix
@@ -18,11 +18,9 @@ rec {
   decibel = import ./decibel fullargs;
   pim = import ./pim (fullargs // {kdeworkspace = workspace; });
 
-  env = with args; runCommand "kde-env"
+  env = kde_pkgs: with args; [ (runCommand "kde-env"
   {
-	  KDEDIRS = lib.concatStringsSep ":" ([ libs pimlibs graphics multimedia
-	  toys network utils games edu base runtime workspace extragear_plasma pim] ++
-	  support.all);
+	  KDEDIRS = lib.concatStringsSep ":" (kde_pkgs ++ support.all);
 	  scriptName = "echo-kde-dirs";
   }
   "
@@ -31,5 +29,5 @@ rec {
   echo \"#!/bin/sh\" > \${scriptPath}
   echo \"echo -n export KDEDIRS=\${KDEDIRS}\" >> \${scriptPath}
   chmod +x \${scriptPath}
-  ";
+  ")] ++ kde_pkgs ++ support.all ++ [shared_mime_info qt];
 }
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4/edu/default.nix
index e69a1a49be6..8e6b32c353a 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4/edu/default.nix
@@ -1,14 +1,14 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdeedu-4.0beta4";
+  name = "kdeedu-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdeedu-3.95.0.tar.bz2;
-    sha256 = "0cydl3pp3l0cbfmf774qh8njyhycaf8yxb27k4xf6mipvw1k9jqf";
+    url = mirror://kde/unstable/3.97/src/kdeedu-3.97.0.tar.bz2;
+    sha256 = "1d2319pzs4ymbp2jgmc1kzkr5d9g5p5d1yg6b5l7z4b2qzhchpl4";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace boost readline openbabel ocaml
+  buildInputs = [kdelibs kdepimlibs boost readline openbabel ocaml
   libusb facile python];
   myCmakeFiles = ./myCmakeFiles;
   patchPhase = "
@@ -16,5 +16,4 @@ stdenv.mkDerivation rec {
   sed -e 's@+facile@\${LIBFACILE_INCLUDE_DIR}@' -i \\
   ../kalzium/src/CMakeOCamlInstructions.cmake
   ";
-  configureFlags = "--debug-trycompile";
 }
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4/extragear/default.nix
index c67d4b8682c..69fc626db6d 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4/extragear/default.nix
@@ -1,10 +1,10 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "extragear-plasma-4.0beta4";
+  name = "extragear-plasma-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/extragear-plasma-3.95.0.tar.bz2;
+    url = mirror://kde/unstable/3.97/src/extragear-plasma-3.97.0.tar.bz2;
     sha256 = "1nzfy34ig66gfpgv6kbcmcap13axcy7kvj43srbd0ic6a0giv283";
   };
 
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4/games/default.nix
index e3869e10808..d82f3971e3c 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4/games/default.nix
@@ -1,12 +1,12 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdegames-4.0beta4";
+  name = "kdegames-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdegames-3.95.0.tar.bz2;
-    sha256 = "1zsfslnazl8gmiq51y5d16svv7p92yvs2zsz13zg7zpwy4afxzbp";
+    url = mirror://kde/unstable/3.97/src/kdegames-3.97.0.tar.bz2;
+    sha256 = "12a87lfaqlidjlibxk3q43bdza2c6k5ggqblxdnr8ikjdww2sk29";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace];
+  buildInputs = [kdelibs kdepimlibs];
 }
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4/graphics/default.nix
index 124c9598c9e..b765e63108a 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4/graphics/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdegraphics-4.0beta4";
+  name = "kdegraphics-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdegraphics-3.95.0.tar.bz2;
-    sha256 = "0mfsadv9ihhw6s7pcy1yabc21px47nzfs34c76n1888qb09m5dfw";
+    url = mirror://kde/unstable/3.97/src/kdegraphics-3.97.0.tar.bz2;
+    sha256 = "0f16zyvw37nqhbis34rg6yxg6r95yk2vi9lk3zk8lqjwcs81h5fz";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace libgphoto2 saneBackends
+  buildInputs = [kdelibs kdepimlibs libgphoto2 saneBackends
   djvulibre exiv2 poppler chmlib];
 }
diff --git a/pkgs/desktops/kde-4/libs/setup.sh b/pkgs/desktops/kde-4/libs/setup.sh
index 6f899442d27..851614b0d18 100755
--- a/pkgs/desktops/kde-4/libs/setup.sh
+++ b/pkgs/desktops/kde-4/libs/setup.sh
@@ -2,4 +2,13 @@ addKDEDIRS()
 {
 	addToSearchPath KDEDIRS /share/kde4 /. $1
 }
+
+fixCmakeDbusCalls()
+{
+	dbusPrefix=${1:-@out@}
+	echo "Fixing dbus calls in CMakeLists.txt files"
+# Trailing slash in sed is essential
+	find .. -name CMakeLists.txt \
+	| xargs sed -e "s#\${DBUS_INTERFACES_INSTALL_DIR}/#${dbusPrefix}/share/dbus-1/interfaces/#" -i
+}
 envHooks=(${envHooks[@]} addKDEDIRS)
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4/multimedia/default.nix
index f0870c1740d..feedc95b15b 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4/multimedia/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.0beta4";
+  name = "kdemultimedia-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdemultimedia-3.95.0.tar.bz2;
-    sha256 = "0vjk5gpn45fh7hm982jw1frd7fr0grff96ksmh29wnkc160rh8va";
+    url = mirror://kde/unstable/3.97/src/kdemultimedia-3.97.0.tar.bz2;
+    sha256 = "0q78d1gh5na72aj604myy23qn6xb0izw0igsi1h9i4pc2bsis87i";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace libogg flac cdparanoia lame
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4/network/default.nix
index 21ae2074e06..d962a9c40ea 100644
--- a/pkgs/desktops/kde-4/network/default.nix
+++ b/pkgs/desktops/kde-4/network/default.nix
@@ -1,10 +1,10 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.0beta4";
+  name = "kdenetwork-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdenetwork-3.95.0.tar.bz2;
+    url = mirror://kde/unstable/3.97/src/kdenetwork-3.97.0.tar.bz2;
     sha256 = "118r55aw0pag78kawjfn3vya7aca12n5ypknm1i4khxs747hxqbr";
   };
 
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4/pim/default.nix
index f0f4184d391..397c57df5bf 100644
--- a/pkgs/desktops/kde-4/pim/default.nix
+++ b/pkgs/desktops/kde-4/pim/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdepim-4.0beta4";
+  name = "kdepim-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdepim-3.95.0.tar.bz2;
-    sha256 = "0gzvm4h6ij7i119apmh9w82raygahr18bl0i9m3ynf2mcca0aq94";
+    url = mirror://kde/unstable/3.97/src/kdepim-3.97.0.tar.bz2;
+    sha256 = "1x5ywn1z963azrrm6rlsspzlsbbwxcsb3zc93pdy80qq1jwsf964";
   };
 
   buildInputs = [libXinerama mesa stdenv.gcc.libc alsaLib kdelibs kdepimlibs
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4/pimlibs/default.nix
index 6d273acc67e..077cca5e32c 100644
--- a/pkgs/desktops/kde-4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4/pimlibs/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-4.0beta4";
+  name = "kdepimlibs-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdepimlibs-3.95.0.tar.bz2;
-	sha256 = "1dhn5x3k9myqfymv6ry84v0zm2qwxnrlm1vdlllfvmgbm5nz34mg";
+    url = mirror://kde/unstable/3.97/src/kdepimlibs-3.97.0.tar.bz2;
+	sha256 = "1zv4l592288bdfxqllm8z1cmsjcprfji5harcxf9hhz95igp5n7j";
   };
 
   propagatedBuildInputs = [kdelibs boost gpgme cyrus_sasl openldap];
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4/runtime/default.nix
index f3f241a7ffe..f1740f959fd 100644
--- a/pkgs/desktops/kde-4/runtime/default.nix
+++ b/pkgs/desktops/kde-4/runtime/default.nix
@@ -1,15 +1,14 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.0beta4";
-  builder = ./builder.sh;
+  name = "kdebase-runtime-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdebase-runtime-3.95.0.tar.bz2;
-    sha256 = "1s4fhbz7gpdxmvlr20c7n6cvcb9sn0qxigzpljsxw9524w177ksr";
+    url = mirror://kde/unstable/3.97/src/kdebase-runtime-3.97.0.tar.bz2;
+    sha256 = "16xang1sjj0h8339cfqf6l4qqswyv42sq9w9a3axmckklmfnx6b1";
   };
 
-  propagatedBuildInputs = [kdepimlibs libusb kdebase xineLib];
-  inherit kdelibs;
+  propagatedBuildInputs = [kdepimlibs libusb xineLib];
+  patchPhase = "fixCmakeDbusCalls";
 }
 
diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4/support/eigen.nix
index 163683a2921..2b3520eb942 100644
--- a/pkgs/desktops/kde-4/support/eigen.nix
+++ b/pkgs/desktops/kde-4/support/eigen.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "eigen-1.0.5";
-  src = svnSrc "eigen" "0dr2gzrf17bdgxj4f9ibk7x5j7fqwwjsl800dzfvrhgj6v1mxm4x";
+  src = svnSrc "eigen" "1wh6kdmzsxmk6byp4rq91pz4rfr7hnh17g8f415p0ywxalg6pfkg";
   buildInputs = [ cmake ];
 }
diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4/support/gmm.nix
index 843f9f6aaed..10a2b63863b 100644
--- a/pkgs/desktops/kde-4/support/gmm.nix
+++ b/pkgs/desktops/kde-4/support/gmm.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "gmm-svn";
-  src = svnSrc "gmm" "0qvx9jf17z0mpwy8k6w6bla94gkkslkiv5w98aajfcq34n0zxcpc";
+  src = svnSrc "gmm" "08j40y85dprs9ddzsddimrhssnz08fafq6nhn40l59ddbvvir0gy";
   buildInputs = [ cmake ];
 }
diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4/support/qca.nix
index fda435c7bff..cf542feac7c 100644
--- a/pkgs/desktops/kde-4/support/qca.nix
+++ b/pkgs/desktops/kde-4/support/qca.nix
@@ -2,7 +2,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "qca-2.0.0dev";
-  src = svnSrc "qca" "0dycmk8fn57mz2pfxck6d0g833fqg9zrw17789vxb4ks0xz0p3zp";
+  src = svnSrc "qca" "1jdqh7xg3vqyx7lgngcz9qj6zdnmlwqw7yv2py7gp2qma7a0annd";
   buildInputs = [ cmake qt openssl gettext cyrus_sasl libgcrypt gnupg ];
   patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../CMakeLists.txt";
 }
diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4/support/qimageblitz.nix
index 3364b4eac5d..0abdd882a50 100644
--- a/pkgs/desktops/kde-4/support/qimageblitz.nix
+++ b/pkgs/desktops/kde-4/support/qimageblitz.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "qimageblitz-4.0.0svn";
-  src = svnSrc "qimageblitz" "0gi78bald70bc540jqcpa70x23hycywibn4raf5602hv4d5n8mnx";
+  src = svnSrc "qimageblitz" "0rmfkl529fmlb495whlidffib1x5s03xzsyaxild3rrsf4h1npcx";
   buildInputs = [cmake qt];
 }
diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4/support/soprano.nix
index 0cb490b9db7..c2b9a3b0903 100644
--- a/pkgs/desktops/kde-4/support/soprano.nix
+++ b/pkgs/desktops/kde-4/support/soprano.nix
@@ -2,7 +2,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "soprano-1.9.0svn";
-  src = svnSrc "soprano" "02xfp7g41ahxwczkxipyi13rav6akhwgspxdhgk5gm94rg10hq2l";
+  src = svnSrc "soprano" "1zzn84k6m351y9pr0kkxb1d4i3jb3mkyyqc07bq0im56m8bvrcm7";
   CLUCENE_HOME=cluceneCore;
   buildInputs = [ cmake qt cluceneCore redland ];
 }
diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4/support/strigi.nix
index d1ec98ea25f..9e7d1f0c9ac 100644
--- a/pkgs/desktops/kde-4/support/strigi.nix
+++ b/pkgs/desktops/kde-4/support/strigi.nix
@@ -2,7 +2,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "strigi-svn";
-  src = svnSrc "strigi" "0dp145n93bqp91lvk2n10mghppyhdm3anh1l3a18d20hrvsm42z5";
+  src = svnSrc "strigi" "198arwd87l97gg5rs3p7rk9wiw1mrdsw9y0zwvrwnxs7glgj201h";
   CLUCENE_HOME=cluceneCore;
   buildInputs = [ cmake zlib cluceneCore bzip2 libxml2 qt dbus
   log4cxx stdenv.gcc.libc exiv2 bison cppunit perl ];
diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4/support/taglib.nix
index 9a2acc96636..fd6dac35fd9 100644
--- a/pkgs/desktops/kde-4/support/taglib.nix
+++ b/pkgs/desktops/kde-4/support/taglib.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "taglib-1.4svn";
-  src = svnSrc "taglib" "1myfgykflbs3l1mrzg4iv8rb1mbd0vpmzl5dnnslfi9b0xg6ydip";
+  src = svnSrc "taglib" "0jmy1mldpjqnq8ap3ynwagxpjcfxzbisa4qd6zdwlwcm8zb54rak";
   buildInputs = [ cmake zlib ];
 }
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4/toys/default.nix
index 19c08c4891b..1ebb427927d 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4/toys/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdetoys-4.0beta4";
+  name = "kdetoys-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdetoys-3.95.0.tar.bz2;
-    sha256 = "0qg9ns640v21sa837pg5basnw8clnkyxap2lm7s69ainsg69662v";
+    url = mirror://kde/unstable/3.97/src/kdetoys-3.97.0.tar.bz2;
+    sha256 = "1ga2xlsr7wl7jnc4clzabgyv5wfcjgpfmv6ca99bkz31nr6lddpa";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace];
diff --git a/pkgs/desktops/kde-4/base/builder.sh b/pkgs/desktops/kde-4/utils/builder.sh
similarity index 78%
rename from pkgs/desktops/kde-4/base/builder.sh
rename to pkgs/desktops/kde-4/utils/builder.sh
index 99b357fcf16..c0df3758964 100755
--- a/pkgs/desktops/kde-4/base/builder.sh
+++ b/pkgs/desktops/kde-4/utils/builder.sh
@@ -6,7 +6,6 @@ myPatchPhase()
 # Trailing slash in sed is essential
 	find .. -name CMakeLists.txt \
 	| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
-	#sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h
 }
 patchPhase=myPatchPhase
 genericBuild
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4/utils/default.nix
index cee61c0e4cd..fe453938c94 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4/utils/default.nix
@@ -1,13 +1,14 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdeutils-4.0beta4";
+  name = "kdeutils-4.0rc2";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdeutils-3.95.0.tar.bz2;
-    sha256 = "1b8jvdy83qwhnfwqxzx96bxnaxss25psazifymyb0z4ynkqmadlh";
+    url = mirror://kde/unstable/3.97/src/kdeutils-3.97.0.tar.bz2;
+    sha256 = "0nhs91xf83xyf4wlpppavrhyi76qdnilhaynwjirx5n85hjl4iiq";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace gmp libzip python ];
 # TODO : tpctl
+  patchPhase="fixCmakeDbusCalls";
 }
diff --git a/pkgs/desktops/kde-4/workspace/builder.sh b/pkgs/desktops/kde-4/workspace/builder.sh
index 648d6175f35..f5a5b5a90bf 100755
--- a/pkgs/desktops/kde-4/workspace/builder.sh
+++ b/pkgs/desktops/kde-4/workspace/builder.sh
@@ -2,10 +2,7 @@ source ${stdenv}/setup
 
 myPatchPhase()
 {
-	echo "Fixing dbus calls in CMakeLists.txt files"
-# Trailing slash in sed is essential
-	find .. -name CMakeLists.txt \
-	| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
+	fixCmakeDbusCalls
 	sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../kcontrol/randr/randr.h
 }
 patchPhase=myPatchPhase
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4/workspace/default.nix
index 829393f67e9..162277a03ed 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4/workspace/default.nix
@@ -1,15 +1,13 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.0beta4";
+  name = "kdebase-workspace-4.0rc2";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.95/src/kdebase-workspace-3.95.0.tar.bz2;
-    sha256 = "0jripmw8vgs7lxlsif552rr9vqps5kav8jdlfyhmr9c3xw5c99v0";
+    url = mirror://kde/unstable/3.97/src/kdebase-workspace-3.97.0.tar.bz2;
+    sha256 = "1sb3vm5y50af6qvsg4sjw14z7y4j1zbgp7w8gsffigbr0hyj4apl";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdebase kderuntime stdenv.gcc.libc];
-  inherit kdelibs;
+  buildInputs = [kdelibs kdepimlibs stdenv.gcc.libc];
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9acb6e666e8..9c6aaf240e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4444,7 +4444,7 @@ rec {
       shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
 	  xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
 	  saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
-	  openbabel ocaml facile stdenv;
+	  openbabel ocaml facile stdenv poppler_data;
 	cdparanoia = cdparanoiaIII;
     inherit (xlibs)
       inputproto kbproto scrnsaverproto xextproto xf86miscproto