diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 9c56268b6136..cafd77c21af3 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -31,6 +31,12 @@ rec { qca2 = import ./support/qca2 { inherit (pkgs) stdenv fetchurl which qt4; }; + + akonadi = import ./support/akonadi { + inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql; + inherit automoc4; + }; + ### LIBS kdelibs = import ./libs { inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt; @@ -62,6 +68,18 @@ rec { ### ADDITIONAL + kdepimlibs = import ./pimlibs { + inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme pthread_stubs libical; + inherit kdelibs; + inherit automoc4 phonon akonadi; + }; + + kdeadmin = import ./admin { + inherit (pkgs) stdenv fetchurl cmake qt4 perl; + inherit kdelibs kdepimlibs; + inherit automoc4 phonon; + }; + kdegraphics = import ./graphics { inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends gphoto2; inherit (pkgs) libspectre djvulibre chmlib; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix new file mode 100644 index 000000000000..ab7ee1b2da54 --- /dev/null +++ b/pkgs/development/libraries/libical/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation { + name = "libical-0.43"; + src = fetchurl { + url = http://superb-east.dl.sourceforge.net/sourceforge/freeassociation/libical-0.43.tar.gz; + md5 = "5f0a1feb60894d0be537aefea5647474"; + }; + buildInputs = [ perl ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcb1b6991d3e..b0b9fe923eed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3281,6 +3281,10 @@ let inherit fetchurl stdenv pkgconfig libusb libtool libexif libjpeg gettext; }; + libical = import ../development/libraries/libical { + inherit stdenv fetchurl perl; + }; + libQGLViewer = import ../development/libraries/libqglviewer { inherit fetchurl stdenv; inherit qt4;