Support nepomuk and marble in digikam.
Also stop passing lib. svn path=/nixpkgs/trunk/; revision=21465
This commit is contained in:
parent
8137966874
commit
4ba1c06c89
|
@ -220,9 +220,9 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
digikam = import ./extragear/digikam {
|
digikam = import ./extragear/digikam {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext;
|
inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext;
|
||||||
inherit kdelibs kdepimlibs kdegraphics;
|
inherit kdelibs kdepimlibs kdegraphics kdeedu;
|
||||||
inherit automoc4 phonon qimageblitz qca2 eigen;
|
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
|
||||||
};
|
};
|
||||||
|
|
||||||
filelight = import ./extragear/filelight {
|
filelight = import ./extragear/filelight {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
|
||||||
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}:
|
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "digikam-1.2.0";
|
name = "digikam-1.2.0";
|
||||||
|
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
|
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
|
||||||
lcms jasper libgphoto2 kdepimlibs gettext ];
|
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu ];
|
||||||
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
|
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "Photo Management Program";
|
description = "Photo Management Program";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.digikam.org;
|
homepage = http://www.digikam.org;
|
||||||
maintainers = [ lib.maintainers.viric ];
|
maintainers = [ stdenv.lib.maintainers.viric ];
|
||||||
platforms = with lib.platforms; linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue