* kdebase: build with kbd and screensaver support.
svn path=/nixpkgs/trunk/; revision=8489
This commit is contained in:
parent
fb35c8efd5
commit
553289da58
@ -1,7 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, x11, zlib, libpng, libjpeg, perl, qt
|
{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
|
||||||
, kdelibs, openssl, bzip2, fontconfig
|
, qt, kdelibs, openssl, bzip2, fontconfig
|
||||||
, libXrandr, libXinerama, libXau, libXdmcp, libXcursor, libfontenc
|
|
||||||
, imake, bdftopcf
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -13,10 +11,12 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig x11 zlib libpng libjpeg perl qt
|
pkgconfig x11 zlib libpng libjpeg perl
|
||||||
kdelibs openssl bzip2 fontconfig
|
qt kdelibs openssl bzip2 fontconfig
|
||||||
libXrandr libXinerama libXau libXdmcp libXcursor libfontenc
|
xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
|
||||||
imake bdftopcf
|
xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
|
||||||
|
xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
|
||||||
|
xlibs.scrnsaverproto xlibs.libXScrnSaver
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
|
@ -3113,10 +3113,8 @@ rec {
|
|||||||
|
|
||||||
kdebase = import ../desktops/kde/kdebase {
|
kdebase = import ../desktops/kde/kdebase {
|
||||||
inherit
|
inherit
|
||||||
fetchurl stdenv pkgconfig x11 zlib libpng libjpeg perl
|
fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
|
||||||
kdelibs openssl bzip2 fontconfig;
|
kdelibs openssl bzip2 fontconfig;
|
||||||
inherit (xlibs) libXrandr libXinerama libXau libXdmcp libXcursor
|
|
||||||
libfontenc imake bdftopcf;
|
|
||||||
qt = qt3;
|
qt = qt3;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user