From 6437240b8e0ea80c8c605d4579176c565be042cf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 3 Oct 2009 11:30:16 +0000 Subject: [PATCH] Fixed compilation of KDE PIM runtime svn path=/nixpkgs/trunk/; revision=17624 --- pkgs/desktops/kde-4.3/default.nix | 5 +++-- pkgs/desktops/kde-4.3/pim-runtime/default.nix | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index b14356c2075..59c0c426079 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -159,9 +159,10 @@ rec { }; kdepim_runtime = import ./pim-runtime { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost; + inherit (pkgs) shared_mime_info; inherit kdelibs kdelibs_experimental kdepimlibs; - inherit automoc4 phonon; + inherit automoc4 phonon akonadi soprano strigi; }; kdeplasma_addons = import ./plasma-addons { diff --git a/pkgs/desktops/kde-4.3/pim-runtime/default.nix b/pkgs/desktops/kde-4.3/pim-runtime/default.nix index fd3c3f63995..c20f61c3951 100644 --- a/pkgs/desktops/kde-4.3/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.3/pim-runtime/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info +, kdelibs, kdelibs_experimental, kdepimlibs +, automoc4, phonon, akonadi, soprano, strigi}: stdenv.mkDerivation { name = "kdepim-runtime-4.3.1"; @@ -6,7 +8,11 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.3.1/src/kdepim-runtime-4.3.1.tar.bz2; sha1 = "c39b0fc1d3721fb8c6074ba6a174ad8716c6c604"; }; - buildInputs = [ cmake qt4 perl kdelibs kdelibs_experimental kdepimlibs automoc4 phonon ]; + buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info + kdelibs kdelibs_experimental kdepimlibs + automoc4 phonon akonadi soprano strigi ]; + CMAKE_PREFIX_PATH=kdepimlibs; + includeAllQtDirs=true; meta = { description = "KDE PIM runtime"; homepage = http://www.kde.org;