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

digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10)

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2013-05-30 15:11:20 +02:00
parent 6c4c1c4fb6
commit 71229f8eb9
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/graphics/digikam/2.nix Normal file
View File

@ -0,0 +1,32 @@
{ 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 }:
stdenv.mkDerivation rec {
name = "digikam-2.9.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk";
};
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 ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
inherit (kdelibs.meta) platforms;
};
}

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

@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
shared_desktop_ontologies, marble, mysql }: shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "digikam-2.6.0"; name = "digikam-3.2.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2"; url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
}; };
nativeBuildInputs = [ cmake automoc4 pkgconfig ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ];

5
pkgs/top-level/all-packages.nix
View File

@ -8725,7 +8725,10 @@ let
calligra = callPackage ../applications/office/calligra { }; calligra = callPackage ../applications/office/calligra { };
digikam = callPackage ../applications/graphics/digikam { }; digikam = if builtins.compareVersions "4.9" kde4.release == 1 then
callPackage ../applications/graphics/digikam/2.nix { }
else
callPackage ../applications/graphics/digikam { };
k3b = callPackage ../applications/misc/k3b { }; k3b = callPackage ../applications/misc/k3b { };