* Update kdepimlibs.

* Remove unnecessary NIX_LDFLAGS hacks.

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

4 files changed, 10 insertions, 14 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 153b894e045f4..ff4a61ad9b226 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 { };
 
 ### BASE
 
diff --git a/pkgs/desktops/kde-4.7/pimlibs/default.nix b/pkgs/desktops/kde-4.7/pimlibs/default.nix
index a1e26384e47ad..643569352cd73 100644
--- a/pkgs/desktops/kde-4.7/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.7/pimlibs/default.nix
@@ -1,11 +1,13 @@
-{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, automoc4, akonadi, soprano}:
+{ stdenv, kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
+, kdelibs, automoc4, akonadi, soprano, phonon, shared_desktop_ontologies, libxslt }:
 
 kde.package {
 
-  buildInputs = [ cmake automoc4 perl shared_mime_info ];
-  propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
-    akonadi soprano ];
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon boost gpgme shared_mime_info
+      shared_desktop_ontologies soprano libical libxslt openldap
+      cyrus_sasl akonadi perl
+    ];
 
   meta = {
     description = "KDE PIM libraries";
diff --git a/pkgs/desktops/kde-4.7/runtime.nix b/pkgs/desktops/kde-4.7/runtime.nix
index 3674e4e33577c..6e6b9aa32a012 100644
--- a/pkgs/desktops/kde-4.7/runtime.nix
+++ b/pkgs/desktops/kde-4.7/runtime.nix
@@ -11,9 +11,6 @@ kde.package {
       (libcanberra.override { gtk = null; })
     ];
 
-  # Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
-  NIX_LDFLAGS = "-lutil";
-    
   meta = {
     license = "LGPL";
     kde.name = "kde-runtime";
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index c87b709aa1d84..f1aaed0cb47e6 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,7 +1,7 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
 , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
-, phonon, xkeyboard_config
+, phonon, xkeyboard_config, kdepimlibs
 }:
 
 kde.package {
@@ -13,12 +13,9 @@ kde.package {
       xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
       libusb python libqalculate akonadi perl consolekit phonon
+      kdepimlibs
     ];
 
-  # Workaround for undefined reference to ‘dlsym’ in
-  # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
-  NIX_LDFLAGS = "-ldl -lrt";
-
   preConfigure =
    ''
      # Fix incorrect path to kde4-config.