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

Revert digikam change

Browse Source 
svn path=/nixpkgs/trunk/; revision=31714
This commit is contained in:
Yury G. Kudryashov 2012-01-19 20:28:09 +00:00
parent d38c5e7ee4
commit 8deba0e4f8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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