* kdebase: build with kbd and screensaver support.

svn path=/nixpkgs/trunk/; revision=8489
This commit is contained in:
Eelco Dolstra 2007-03-29 17:56:33 +00:00
parent fb35c8efd5
commit 553289da58
2 changed files with 9 additions and 11 deletions

View File

@ -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 = "

View File

@ -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;
};