- Completed all dependencies for kdelibs-4.4.0

- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


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

5 files changed, 12 insertions, 39 deletions

diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix
index 7e947eaf3bea..5b0caee76e7f 100644
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@@ -5,10 +5,10 @@
 # some bindings are even broken.
 
 stdenv.mkDerivation {
-  name = "kdebindings-4.3.4";
+  name = "kdebindings-4.4.0";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdebindings-4.3.4.tar.bz2;
-    sha1 = "0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b";
+    url = mirror://kde/stable/4.4.0/src/kdebindings-4.4.0.tar.bz2;
+    sha1 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
   };
   builder = ./builder.sh;
   includeAllQtDirs=true;
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index cd701f62d1b1..b3f65e468a62 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -61,15 +61,12 @@ pkgs.recurseIntoAttrs (rec {
   kdelibs = import ./libs {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
     inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
-      kerberos acl attr;
+      kerberos acl attr shared_desktop_ontologies;
     inherit (pkgs.xlibs) libXScrnSaver;
-    inherit automoc4 phonon strigi soprano qca2 attica;
+    inherit automoc4 phonon strigi soprano qca2 attica polkit_qt;
   };
 
-  kdelibs_experimental = import ./libs-experimental {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
-    inherit automoc4 kdelibs phonon;
-  };
+  kdelibs_experimental = null;
   
 ### BASE  
   kdebase_workspace = import ./base-workspace {
diff --git a/pkgs/desktops/kde-4.4/libs-experimental/builder.sh b/pkgs/desktops/kde-4.4/libs-experimental/builder.sh
deleted file mode 100644
index a96733cde78f..000000000000
--- a/pkgs/desktops/kde-4.4/libs-experimental/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$out/share/dbus-1|" knotificationitem/CMakeLists.txt
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/desktops/kde-4.4/libs-experimental/default.nix b/pkgs/desktops/kde-4.4/libs-experimental/default.nix
deleted file mode 100644
index b5c4801c4d28..000000000000
--- a/pkgs/desktops/kde-4.4/libs-experimental/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}:
-
-stdenv.mkDerivation {
-  name = "kdelibs-experimental-4.3.4";
-  src = fetchurl {
-    url = mirror://kde/stable/4.3.4/src/kdelibs-experimental-4.3.4.tar.bz2;
-    sha1 = "43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd";
-  };
-  builder = ./builder.sh;
-  buildInputs = [ cmake qt4 perl automoc4 kdelibs phonon ];
-  includeAllQtDirs=true;
-  meta = {
-    description = "KDE experimental library";
-    license = "LGPL";
-    homepage = http://www.kde.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix
index 04efaf230f88..8882c7b68f39 100644
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, lib, perl
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, libXScrnSaver
-, automoc4, phonon, strigi, soprano, qca2, attica
+, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt
 }:
 
 stdenv.mkDerivation {
@@ -17,10 +17,12 @@ stdenv.mkDerivation {
   buildInputs = [
     cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
     shared_mime_info giflib jasper openexr aspell avahi kerberos acl attr
-    libXScrnSaver
-    automoc4 phonon strigi soprano qca2 attica
+    shared_desktop_ontologies libXScrnSaver
+    automoc4 phonon strigi soprano qca2 attica polkit_qt
   ];
 
+  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" ];