* Updated kdepim-runtime and kdepim.

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

6 files changed, 55 insertions, 66 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 7dff75be9ab63..ccfcb61c71b85 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,7 @@ recurseIntoAttrs rec {
 
   kdelibs = callPackage ./libs { };
 
-  kdepimlibs = callPackage ./pimlibs { };
+  kdepimlibs = callPackage ./pimlibs.nix { };
 
 ### BASE
 
@@ -174,10 +174,9 @@ recurseIntoAttrs rec {
     kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
   };
 
-  /*
-  kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ./pim { };
-  */
+  kdepim_runtime = callPackage ./pim-runtime.nix { };
+  
+  kdepim = callPackage ./pim.nix { };
 
 ### DEVELOPMENT
 
diff --git a/pkgs/desktops/kde-4.7/pim-runtime.nix b/pkgs/desktops/kde-4.7/pim-runtime.nix
new file mode 100644
index 0000000000000..155634aba1d8d
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pim-runtime.nix
@@ -0,0 +1,17 @@
+{ kde, fetchurl, cmake, kdelibs, qt4, phonon, libxml2, libxslt, boost
+, kdepimlibs, automoc4, akonadi, soprano, strigi, shared_mime_info
+, shared_desktop_ontologies }:
+
+kde.package rec {
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs akonadi strigi
+      soprano boost shared_mime_info shared_desktop_ontologies
+      libxml2 libxslt
+    ];
+
+  meta = {
+    description = "KDE PIM runtime";
+    license = "GPL";
+    kde.name = "kdepim-runtime";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/pim-runtime/default.nix b/pkgs/desktops/kde-4.7/pim-runtime/default.nix
deleted file mode 100644
index d92f1eecc73ba..0000000000000
--- a/pkgs/desktops/kde-4.7/pim-runtime/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
-, automoc4, phonon, akonadi, soprano, strigi}:
-
-kde.package rec {
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
-                  kdelibs kdepimlibs
-		  automoc4 phonon akonadi soprano strigi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
-  };
-
-  meta = {
-    description = "KDE PIM runtime";
-    homepage = http://www.kde.org;
-    license = "GPL";
-    kde = {
-      name = "kdepim-runtime";
-      version = "4.4.8";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/pim.nix b/pkgs/desktops/kde-4.7/pim.nix
new file mode 100644
index 0000000000000..fe074200fe9c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pim.nix
@@ -0,0 +1,34 @@
+{ kde, fetchurl, cmake, boost, gpgme, libassuan, libxslt
+, kdelibs, kdepimlibs, kdepim_runtime
+, automoc4, akonadi, qt4, phonon, soprano, shared_desktop_ontologies
+, strigi, cyrus_sasl }:
+
+kde.package rec {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs boost soprano
+      akonadi strigi shared_desktop_ontologies libxslt cyrus_sasl
+      gpgme libassuan
+      #boost gpgme libassuan libgpgerror libxslt
+      #shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi
+    ];
+    
+  #prePatch = ''
+  #    find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
+  #'';
+  
+  postInstall = ''
+      mkdir -p $out/nix-support/
+      echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
+  '';
+
+  meta = {
+    description = "KDE PIM tools";
+    longDescription = ''
+      Contains various personal information management tools for KDE, such as an organizer.
+    '';
+    license = "GPL";
+    homepage = http://pim.kde.org;
+    kde.name = "kdepim";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/pim/default.nix b/pkgs/desktops/kde-4.7/pim/default.nix
deleted file mode 100644
index cdcc3dc023dbf..0000000000000
--- a/pkgs/desktops/kde-4.7/pim/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
-, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
-
-kde.package rec {
-
-  buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
-    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
-  postInstall = ''
-      mkdir -p $out/nix-support/
-      echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
-  '';
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
-  };
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-    kde = {
-      name = "kdepim";
-      version = "4.4.8";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/pimlibs/default.nix b/pkgs/desktops/kde-4.7/pimlibs.nix
index 643569352cd73..643569352cd73 100644
--- a/pkgs/desktops/kde-4.7/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.7/pimlibs.nix