Digikam-1.4.0, move to all-packages.nix

svn path=/nixpkgs/trunk/; revision=24089
This commit is contained in:
Yury G. Kudryashov 2010-10-05 17:44:05 +00:00
parent bf340ad55a
commit 739f82a526
3 changed files with 12 additions and 16 deletions

View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
liblqr1, lensfun }:
liblqr1, lensfun, pkgconfig }:
stdenv.mkDerivation rec {
name = "digikam-1.2.0";
name = "digikam-1.4.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "01hjcdm3l5rxz8wb7rvsplysy8hw2b3hcggg9dgk9bskpfskj1ck";
sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk";
};
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ];
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
pkgconfig ];
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
inherit (kdelibs.meta) platforms;
};
}

View File

@ -216,13 +216,6 @@ pkgs.recurseIntoAttrs (rec {
#### EXTRA GEAR
digikam = import ./extragear/digikam {
inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
liblqr1 lensfun;
inherit kdelibs kdepimlibs kdegraphics kdeedu;
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
};
filelight = import ./extragear/filelight {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs kdebase_workspace;
@ -261,7 +254,7 @@ pkgs.recurseIntoAttrs (rec {
};
inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform
kdevelop kipi_plugins;
kdevelop kipi_plugins digikam;
gtk_qt_engine = import ./extragear/gtk-qt-engine {
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;

View File

@ -5373,6 +5373,8 @@ let
dia = callPackage ../applications/graphics/dia { };
digikam = newScope pkgs.kde4 ../applications/graphics/digikam { };
djvulibre = callPackage ../applications/misc/djvulibre { };
djview4 = callPackage ../applications/graphics/djview { };