diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-03 03:45:58 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-03 03:45:58 +0000 |
| commit | 2d9ba975e788a134c254e1967758f85f9db4e876 (patch) | |
| tree | 5d47976d1a7486477b4c8d8ea91c5f24c15fcd98 /pkgs/desktops/kde-4.4 | |
| parent | 83f4846c49580be3a12e0643d5baa97225135270 (diff) | |
| download | nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar.gz nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar.bz2 nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar.lz nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar.xz nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.tar.zst nixlib-2d9ba975e788a134c254e1967758f85f9db4e876.zip | |
digikam: use external lensfun and lqr-1
svn path=/nixpkgs/trunk/; revision=21561
Diffstat (limited to 'pkgs/desktops/kde-4.4')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 3 | ||||
| -rw-r--r-- | 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 b920dceb511b..7461bf8f8791 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 29e6d38c0b9c..51e7365a8543 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"; |