From 553289da58210ed444e342b5a1902d9b98178ddc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Mar 2007 17:56:33 +0000
Subject: [PATCH] * kdebase: build with kbd and screensaver support.

svn path=/nixpkgs/trunk/; revision=8489
---
 pkgs/desktops/kde/kdebase/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix       |  4 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix
index 7f76cc43207..95e2ea743fb 100644
--- a/pkgs/desktops/kde/kdebase/default.nix
+++ b/pkgs/desktops/kde/kdebase/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, x11, zlib, libpng, libjpeg, perl, qt
-, kdelibs, openssl, bzip2, fontconfig
-, libXrandr, libXinerama, libXau, libXdmcp, libXcursor, libfontenc
-, imake, bdftopcf
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
+, qt, kdelibs, openssl, bzip2, fontconfig
 }:
 
 stdenv.mkDerivation {
@@ -13,10 +11,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig x11 zlib libpng libjpeg perl qt
-    kdelibs openssl bzip2 fontconfig
-    libXrandr libXinerama libXau libXdmcp libXcursor libfontenc
-    imake bdftopcf
+    pkgconfig x11 zlib libpng libjpeg perl
+    qt kdelibs openssl bzip2 fontconfig
+    xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
+    xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
+    xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
+    xlibs.scrnsaverproto xlibs.libXScrnSaver
   ];
 
   configureFlags = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f327befd25..e242312a710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3113,10 +3113,8 @@ rec {
   
   kdebase = import ../desktops/kde/kdebase {
     inherit
-      fetchurl stdenv pkgconfig x11 zlib libpng libjpeg perl
+      fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
       kdelibs openssl bzip2 fontconfig;
-    inherit (xlibs) libXrandr libXinerama libXau libXdmcp libXcursor
-      libfontenc imake bdftopcf;
     qt = qt3;
   };