From d3e990cf909aa8c8ca48da9bb440017f6bba9fbd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 19 Feb 2009 16:14:03 +0000
Subject: [PATCH] Added kdeadmin-4.2 package and kdepimlibs support

svn path=/nixpkgs/trunk/; revision=14130
---
 pkgs/desktops/kde-4.2/admin/default.nix          |  1 +
 pkgs/desktops/kde-4.2/base-workspace/default.nix | 11 ++++++-----
 pkgs/desktops/kde-4.2/default.nix                |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix
index db425bb99b7..8107ea54743 100644
--- a/pkgs/desktops/kde-4.2/admin/default.nix
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.0/src/kdeadmin-4.2.0.tar.bz2;
     md5 = "2c5b33477b5679bcd9fdbc1f8017e6fb";
   };
+  CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 pkgconfig perl kdelibs kdepimlibs automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix
index 0cc523eb56f..84af8505417 100644
--- a/pkgs/desktops/kde-4.2/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, cmake, perl, python,
-qt4, kdelibs,
-libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage,
-lm_sensors, libxklavier, libusb, pthread_stubs,
-automoc4, phonon, strigi, soprano, qimageblitz}:
+ qt4, kdelibs, kdepimlibs,
+ libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage,
+ lm_sensors, libxklavier, libusb, pthread_stubs, boost,
+ automoc4, phonon, strigi, soprano, qimageblitz}:
 
 stdenv.mkDerivation {
   name = "kdebase-workspace-4.2.0";
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.0/src/kdebase-workspace-4.2.0.tar.bz2;
     md5 = "193e30b9ed0b55b0196289d9df43a904";
   };
-  buildInputs = [ cmake perl python qt4 kdelibs pthread_stubs libusb stdenv.gcc.libc
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake perl python qt4 kdelibs kdepimlibs pthread_stubs boost libusb stdenv.gcc.libc
                   libXi libXau libXdmcp libXtst libXcomposite libXdamage
                   lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
 }
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 74fd385d89c..f1d9f588764 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -47,9 +47,9 @@ rec {
 ### BASE  
   kdebase_workspace = import ./base-workspace {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl python;
-    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs;
+    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
     inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage;
-    inherit kdelibs;
+    inherit kdelibs kdepimlibs;
     inherit automoc4 phonon strigi soprano qimageblitz;
   };