From 739f82a526c76b3bf3922287d6d34001bb244bfb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 5 Oct 2010 17:44:05 +0000
Subject: [PATCH] Digikam-1.4.0, move to all-packages.nix

svn path=/nixpkgs/trunk/; revision=24089
---
 .../graphics}/digikam/default.nix               | 17 +++++++++--------
 pkgs/desktops/kde-4.4/default.nix               |  9 +--------
 pkgs/top-level/all-packages.nix                 |  2 ++
 3 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{desktops/kde-4.4/extragear => applications/graphics}/digikam/default.nix (63%)

diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
similarity index 63%
rename from pkgs/desktops/kde-4.4/extragear/digikam/default.nix
rename to pkgs/applications/graphics/digikam/default.nix
index 51e7365a854..a126402cadf 100644
--- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -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 { 
+  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;
   };
 }
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index fff00de1942..33b97d5cfb5 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 782f6ae2006..95197816baa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };