diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-03-29 17:56:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-03-29 17:56:33 +0000 |
| commit | 553289da58210ed444e342b5a1902d9b98178ddc (patch) | |
| tree | 62a871ca26cc3a5ea7f9f03179d8a3c65193326f /pkgs | |
| parent | fb35c8efd5e309dee474b21fb03cd037c59b8b92 (diff) | |
| download | nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar.gz nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar.bz2 nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar.lz nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar.xz nixlib-553289da58210ed444e342b5a1902d9b98178ddc.tar.zst nixlib-553289da58210ed444e342b5a1902d9b98178ddc.zip | |
* kdebase: build with kbd and screensaver support.
svn path=/nixpkgs/trunk/; revision=8489
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde/kdebase/default.nix | 16 | ||||
| -rw-r--r-- | 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 7f76cc432076..95e2ea743fb7 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 4f327befd25b..e242312a710d 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; }; |