From 298c78ef406ac40bd99b7ffee3f4ad5e0ab3b914 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jul 2011 08:42:01 +0000
Subject: [PATCH] * Build kdm.

svn path=/nixpkgs/branches/kde-4.7/; revision=27772
---
 pkgs/desktops/kde-4.7/default.nix   |  7 ++-----
 pkgs/desktops/kde-4.7/workspace.nix | 12 +++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index ae6f409cb31..5970d94602d 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -29,6 +29,7 @@ recurseIntoAttrs rec {
   kde = callPackage ./kde-package { inherit release; stable = false; };
 
 ### SUPPORT
+
   akonadi = callPackage ./support/akonadi { };
 
   oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -42,16 +43,12 @@ recurseIntoAttrs rec {
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
+
   kdelibs = callPackage ./libs { };
 
   kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
-  kdebase = callPackage ./base { };
-
-  kdebase_workspace = callPackage ./base-workspace { };
-
-  kdebase_runtime = callPackage ./base-runtime { };
 
   kde_baseapps = callPackage ./baseapps.nix { };
 
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index 7cb03df0c42..f4820f76623 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,6 +1,6 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python, libqalculate, akonadi
+, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
 }:
 
 kde.package {
@@ -8,13 +8,15 @@ kde.package {
   buildInputs =
     [ cmake kdelibs qt4 automoc4 strigi qimageblitz libdbusmenu_qt
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
-      xorg.libXcomposite xorg.libXdamage xorg.libXau
+      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
+      xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate akonadi
+      libusb python libqalculate akonadi perl consolekit
     ];
 
-  # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
-  NIX_LDFLAGS = "-ldl";
+  # Workaround for undefined reference to ‘dlsym’ in
+  # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
+  NIX_LDFLAGS = "-ldl -lrt";
 
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System Settings";