From 96ff884c3d5d7cceb7cafbede142c955cd79596a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 10 Sep 2009 20:01:22 +0000
Subject: [PATCH] - Added kdepim-runtime package - Updated KDE plasma addons to
 4.3.1

svn path=/nixpkgs/trunk/; revision=17033
---
 pkgs/desktops/kde-4.3/default.nix             | 12 ++++++++---
 pkgs/desktops/kde-4.3/pim-runtime/default.nix | 16 +++++++++++++++
 .../kde-4.3/plasma-addons/default.nix         | 20 +++++++++++++------
 3 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.3/pim-runtime/default.nix

diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index e3867b9537a..94ac855d0ab 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -143,12 +143,18 @@ rec {
     inherit automoc4 phonon akonadi strigi soprano qca2;
   };
   
-  kdeplasma_addons = import ./plasma-addons {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl python shared_mime_info;
-    inherit kdelibs kdebase_workspace kdepimlibs kdegraphics;
+  kdepim_runtime = import ./pim-runtime {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
+    inherit kdelibs kdelibs_experimental kdepimlibs;
     inherit automoc4 phonon;
   };
   
+  kdeplasma_addons = import ./plasma-addons {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info;
+    inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics;
+    inherit automoc4 phonon soprano eigen qimageblitz;
+  };
+  
   kdegames = import ./games {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
     inherit kdelibs;
diff --git a/pkgs/desktops/kde-4.3/pim-runtime/default.nix b/pkgs/desktops/kde-4.3/pim-runtime/default.nix
new file mode 100644
index 00000000000..fd3c3f63995
--- /dev/null
+++ b/pkgs/desktops/kde-4.3/pim-runtime/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdepim-runtime-4.3.1";
+  src = fetchurl {
+    url = mirror://kde/stable/4.3.1/src/kdepim-runtime-4.3.1.tar.bz2;
+    sha1 = "c39b0fc1d3721fb8c6074ba6a174ad8716c6c604";
+  };
+  buildInputs = [ cmake qt4 perl kdelibs kdelibs_experimental kdepimlibs automoc4 phonon ];
+  meta = {
+    description = "KDE PIM runtime";
+    homepage = http://www.kde.org;
+    license = "GPL";
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.3/plasma-addons/default.nix b/pkgs/desktops/kde-4.3/plasma-addons/default.nix
index 5fd04f71717..02919573a9a 100644
--- a/pkgs/desktops/kde-4.3/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.3/plasma-addons/default.nix
@@ -1,16 +1,24 @@
-{stdenv, fetchurl, cmake, qt4, perl, python, shared_mime_info,
- kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}:
+{ stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info
+, kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics
+, automoc4, phonon, soprano, eigen, qimageblitz}:
 
 stdenv.mkDerivation {
-  name = "kdeplasma-addons-4.2.4";
+  name = "kdeplasma-addons-4.3.1";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.4/src/kdeplasma-addons-4.2.4.tar.bz2;
-    sha1 = "500d05cc6eeb218b8615b1a49e69e3b9e88f3997";
+    url = mirror://kde/stable/4.3.1/src/kdeplasma-addons-4.3.1.tar.bz2;
+    sha1 = "83421181dd3a80c4ac0ff5bab111b7f71f6a1192";
   };
   inherit kdebase_workspace;
   builder = ./builder.sh;
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl python shared_mime_info
-                  kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ];
+                  kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics
+		  automoc4 phonon soprano eigen qimageblitz ];
+  meta = {
+    description = "KDE Plasma Addons";
+    license = "GPL";
+    homepage = http://www.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
 }