diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 9b9e6f8d74a5..5644fc8c3e1c 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -29,10 +29,13 @@ rec { }; ### LIBS - kdelibs = import ./libs (pkgs // { + kdelibs = import ./libs { + inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt; + inherit (pkgs) giflib jasper openexr aspell avahi shared_mime_info; inherit automoc4 phonon strigi soprano; - }); - + }; + +### BASE kdebase_workspace = import ./base-workspace { inherit (pkgs) stdenv fetchurl cmake qt4 perl python; inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs; @@ -53,4 +56,11 @@ rec { inherit kdelibs; inherit automoc4 phonon strigi soprano; }; + +### ADDITIONAL + + kdegraphics = import ./graphics { + inherit (pkgs) stdenv fetchurl cmake; + inherit kdelibs; + }; } diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 425dfbc79f1e..912250ccfe75 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , openexr, aspell, avahi -, automoc4, phonon, strigi, soprano, ... +, automoc4, phonon, strigi, soprano }: stdenv.mkDerivation {