summary refs log tree commit diff
path: root/pkgs/applications/graphics/digikam
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2015-01-23 10:26:00 +0100
committerLluís Batlle i Rossell <viric@viric.name>2015-01-23 10:30:16 +0100
commit205e338a83e2849b3f0a2c2fff2745154b13612f (patch)
tree8d758743aafd9e1d86e1f35dc575a975f13b00e4 /pkgs/applications/graphics/digikam
parent8dd230aa09e52e1607353691aab17d434d5195af (diff)
downloadnixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar.gz
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar.bz2
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar.lz
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar.xz
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.tar.zst
nixlib-205e338a83e2849b3f0a2c2fff2745154b13612f.zip
Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1cd28801c69c4c28a0e320de0500787)
Diffstat (limited to 'pkgs/applications/graphics/digikam')
-rw-r--r--pkgs/applications/graphics/digikam/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index b067358ea065..2551a9853121 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, mysql }:
+shared_desktop_ontologies, marble, mysql, libpgf }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.4.0";
+  name = "digikam-4.6.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "1sflh3i989f9xi4qym3rzcrx7ahrjf1n9si8c5q05dgm039a4s2w";
+    sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];
 
   buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
     jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
-    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ];
 
   # Make digikam find some FindXXXX.cmake
   KDEDIRS="${marble}:${qjson}";