From 72edd547411be0c074e40ab83f7ecb5bf4344923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 26 Feb 2010 10:41:53 +0000 Subject: [PATCH] Making digikam build with kdeedu, to get the marble widget working to geolocate photos. svn path=/nixpkgs/trunk/; revision=20266 --- pkgs/desktops/kde-4.3/default.nix | 2 +- pkgs/desktops/kde-4.3/extragear/digikam/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 9fa61fa4881..d6e19d4f6c3 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -221,7 +221,7 @@ pkgs.recurseIntoAttrs (rec { digikam = import ./extragear/digikam { inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext; - inherit kdelibs kdepimlibs kdegraphics; + inherit kdelibs kdepimlibs kdegraphics kdeedu; inherit automoc4 phonon qimageblitz qca2 eigen; }; diff --git a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix index 0de8dd5645c..512912b7413 100644 --- a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, kdeedu, gettext}: stdenv.mkDerivation rec { name = "digikam-1.1.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { includeAllQtDirs=true; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext ]; + lcms jasper libgphoto2 kdepimlibs gettext kdeedu ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; meta = { description = "Photo Management Program";