From a2705398ffb3555777d615d77fe3f86ad2931e4d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 17 Jan 2008 13:04:21 +0000
Subject: [PATCH] kde4.workspace updated

svn path=/nixpkgs/branches/stdenv-updates/; revision=10202
---
 pkgs/desktops/kde-4/workspace/builder.sh  | 9 ---------
 pkgs/desktops/kde-4/workspace/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix           | 2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100755 pkgs/desktops/kde-4/workspace/builder.sh

diff --git a/pkgs/desktops/kde-4/workspace/builder.sh b/pkgs/desktops/kde-4/workspace/builder.sh
deleted file mode 100755
index f5a5b5a90bf..00000000000
--- a/pkgs/desktops/kde-4/workspace/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source ${stdenv}/setup
-
-myPatchPhase()
-{
-	fixCmakeDbusCalls
-	sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../kcontrol/randr/randr.h
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4/workspace/default.nix
index a5929785aec..b6740640c49 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4/workspace/default.nix
@@ -2,12 +2,14 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "kdebase-workspace-4.0.0";
-  builder = ./builder.sh;
   
   src = fetchurl {
     url = mirror://kde/stable/4.0/src/kdebase-workspace-4.0.0.tar.bz2;
     sha256 = "08sgp7jaqljdxwsgr5lyyfd6w734yv24zswps1mchmhj01vz1fcg";
   };
 
-  buildInputs = [kdelibs kdepimlibs stdenv.gcc.libc];
+  propagatedBuildInputs = [kdelibs kdepimlibs stdenv.gcc.libc libusb
+  libpthreadstubs];
+  buildInputs = [cmake];
+  patchPhase = "fixCmakeDbusCalls";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2b88b917af..e09b617b002 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4730,7 +4730,7 @@ rec {
       xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
       libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
       libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
-      libxkbfile libXinerama;
+      libxkbfile libXinerama libpthreadstubs;
     inherit (gtkLibs) glib;
     qt = qt4;
 	dbus = dbus_alts.withX11;