diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-12-25 22:54:32 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-12-25 22:54:32 +0000 |
commit | 94a638d1197b5bb4338b194f00986fb9e51d0137 (patch) | |
tree | 336693e8a8e800598bd63413587f57ccee5c101a /pkgs/applications/graphics/digikam | |
parent | 50fb545705890faa4dc3d03eaa69332dc77c2759 (diff) | |
download | nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar.gz nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar.bz2 nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar.lz nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar.xz nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.tar.zst nixlib-94a638d1197b5bb4338b194f00986fb9e51d0137.zip |
Updating digikam.
Now at least digikam now passes the configure stage. I've still not finished building it though. svn path=/nixpkgs/trunk/; revision=31080
Diffstat (limited to 'pkgs/applications/graphics/digikam')
-rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/graphics/digikam/include.diff | 12 |
2 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 6d4431516f8e..895453aae446 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -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"; diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff deleted file mode 100644 index 0762ce04d263..000000000000 --- a/pkgs/applications/graphics/digikam/include.diff +++ /dev/null @@ -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} - ) - |