Added kdeadmin-4.2 closure

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

4 files changed, 34 insertions, 2 deletions

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..db425bb99b700
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, kdelibs, kdepimlibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdeadmin-4.2.0";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.0/src/kdeadmin-4.2.0.tar.bz2;
+    md5 = "2c5b33477b5679bcd9fdbc1f8017e6fb";
+  };
+  buildInputs = [ cmake qt4 pkgconfig perl kdelibs kdepimlibs automoc4 phonon ];
+}
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index cafd77c21af3d..74fd385d89c0b 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -69,13 +69,13 @@ rec {
 ### ADDITIONAL
 
   kdepimlibs = import ./pimlibs {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme pthread_stubs libical;
+    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 perl;
+    inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl;
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon;
   };
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..ba5e748ff45c1
--- /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.0";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.0/src/kdepimlibs-4.2.0.tar.bz2;
+    md5 = "8a91677e2dca7d4db26b33c78e239e5e";
+  };
+  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
+                  kdelibs automoc4 phonon akonadi ];
+}
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 ];
+}