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

Updating digikam.

Browse Source 
Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
This commit is contained in:
Lluís Batlle i Rossell 2011-12-25 22:54:32 +00:00
parent 50fb545705
commit 94a638d119
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,22 +1,28 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
liblqr1, lensfun, pkgconfig }:
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble }:
stdenv.mkDerivation rec {
name = "digikam-1.5.0";
name = "digikam-2.4.1";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
};
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
pkgconfig ];
pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
marble ];
KDEDIRS=kdeedu;
patches = [ ./include.diff ];
# Make digikam find some FindXXXX.cmake
preConfigure = ''
cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
'';
meta = {
description = "Photo Management Program";

12
pkgs/applications/graphics/digikam/include.diff
View File

@ -1,12 +0,0 @@
diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
index 9ee36cc..c6e5c00 100644
--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
+ ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
${QT_INCLUDE_DIR}
)