dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

digikam: use external lensfun and lqr-1

Browse Source 
svn path=/nixpkgs/trunk/; revision=21561
This commit is contained in:
Yury G. Kudryashov 2010-05-03 03:45:58 +00:00
parent 83f4846c49
commit 2d9ba975e7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/kde-4.4/default.nix
View File

@ -220,7 +220,8 @@ pkgs.recurseIntoAttrs (rec {
}; };
digikam = import ./extragear/digikam { 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 kdelibs kdepimlibs kdegraphics kdeedu;
inherit automoc4 phonon qimageblitz qca2 eigen soprano; inherit automoc4 phonon qimageblitz qca2 eigen soprano;
}; };

5
pkgs/desktops/kde-4.4/extragear/digikam/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, { 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 { stdenv.mkDerivation rec {
name = "digikam-1.2.0"; name = "digikam-1.2.0";
@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen 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" ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
meta = { meta = {
description = "Photo Management Program"; description = "Photo Management Program";