From 2d9ba975e788a134c254e1967758f85f9db4e876 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 03:45:58 +0000 Subject: [PATCH] digikam: use external lensfun and lqr-1 svn path=/nixpkgs/trunk/; revision=21561 --- pkgs/desktops/kde-4.4/default.nix | 3 ++- pkgs/desktops/kde-4.4/extragear/digikam/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index b920dceb511..7461bf8f879 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -220,7 +220,8 @@ pkgs.recurseIntoAttrs (rec { }; digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext; + inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext + liblqr1 lensfun; inherit kdelibs kdepimlibs kdegraphics kdeedu; inherit automoc4 phonon qimageblitz qca2 eigen soprano; }; diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix index 29e6d38c0b9..51e7365a854 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }: +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, +liblqr1, lensfun }: stdenv.mkDerivation rec { name = "digikam-1.2.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu ]; + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; meta = { description = "Photo Management Program";