diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f1135b167..f0dd7295d52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1274,7 +1274,7 @@ rec { }; boost = import ../development/libraries/boost { - inherit fetchurl stdenv /* zlib bzip2 python */; + inherit fetchurl stdenv icu zlib bzip2 python; }; cairo = import ../development/libraries/cairo { @@ -1480,6 +1480,10 @@ rec { inherit aspell; }; + icu = import ../development/libraries/icu { + inherit fetchurl stdenv; + }; + id3lib = import ../development/libraries/id3lib { inherit fetchurl stdenv; }; @@ -1776,7 +1780,7 @@ rec { strigi = import ../development/libraries/strigi { inherit stdenv fetchurl zlib cluceneCore cluceneContrib expat bzip2 - pkgconfig cmake dbus libxml2; + pkgconfig cmake dbus libxml2 perl; qt = qt4; }; @@ -3473,7 +3477,8 @@ rec { inherit fetchurl stdenv zlib perl openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt libtool - expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups boost; + expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups + boost gpgme; inherit (xlibs) inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite @@ -3484,19 +3489,40 @@ rec { kdelibs = kdelibs4; }; + kdepim4 = import ../desktops/kde-4/kdepim { + inherit + fetchurl stdenv zlib perl openssl pcre pkgconfig + libjpeg libpng libtiff libxml2 libxslt libtool libusb + expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups + mesa gpgme boost; + inherit (xlibs) + inputproto kbproto scrnsaverproto xextproto xf86miscproto + xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite + libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm + libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc + libxkbfile libXinerama; + inherit (gtkLibs) glib; + qt = qt4; + kdelibs = kdelibs4; + kdepimlibs = kdepimlibs4; + }; + kdebase4 = import ../desktops/kde-4/kdebase { inherit fetchurl stdenv zlib perl openssl pcre pkgconfig - libjpeg libpng libtiff libxml2 libxslt libtool - expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups; + libjpeg libpng libtiff libxml2 libxslt libtool libusb + expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups + mesa; inherit (xlibs) inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc - libxkbfile; + libxkbfile libXinerama; + inherit (gtkLibs) glib; qt = qt4; kdelibs = kdelibs4; + kdepimlibs = kdepimlibs4; }; kdebase = import ../desktops/kde/kdebase { |