* Update a bunch of dependencies of kdelibs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27702

2 files changed, 9 insertions, 15 deletions

diff --git a/pkgs/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
index e032ec75af574..c36303a187f84 100644
--- a/pkgs/desktops/kde-4.7/libs/default.nix
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -3,24 +3,18 @@
 , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev
+, getopt, udev, herqq
 }:
 
 kde.package {
 
   buildInputs =
-    [ acl attr attica automoc4 avahi bzip2 cmake
-      enchant fam getopt giflib jasper libdbusmenu_qt libXScrnSaver libxslt pcre perl perl polkit_qt_1
-      qt4 shared_mime_info strigi udev
-      xz 
+    [ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
+      giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
+      perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies
+      shared_mime_info soprano strigi udev xz 
     ];
     
-  #buildInputs = [
-  #  cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
-  #  giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
-  #  enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell
-  #];
-
   # TODO: make sonnet plugins (dictionaries) really work.
   # There are a few hardcoded paths.
   # Let kdelibs find openexr
diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix
index 073ea87e9721e..acd2b87701984 100644
--- a/pkgs/desktops/kde-4.7/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.5.3";
+  name = "soprano-2.6.51";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "0hxc6jnbh0529jsc0ixvy8pshnffrpgsadinhk9navkpyn5xg4l9";
+    sha256 = "0sj0cklxahlhig29d0b1a3hr1p2z1xfar7j1slj2klbcy3qn47i0";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
-  buildInputs = [ cmake qt4 cluceneCore redland libiodbc ];
+  buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;