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

Support nepomuk and marble in digikam.

Browse Source 
Also stop passing lib.

svn path=/nixpkgs/trunk/; revision=21465
This commit is contained in:
Yury G. Kudryashov 2010-04-30 20:40:11 +00:00
parent 8137966874
commit 4ba1c06c89
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.4/default.nix
View File

@ -220,9 +220,9 @@ pkgs.recurseIntoAttrs (rec {
};
digikam = import ./extragear/digikam {
inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext;
inherit kdelibs kdepimlibs kdegraphics;
inherit automoc4 phonon qimageblitz qca2 eigen;
inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext;
inherit kdelibs kdepimlibs kdegraphics kdeedu;
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
};
filelight = import ./extragear/filelight {

10
pkgs/desktops/kde-4.4/extragear/digikam/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}:
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }:
stdenv.mkDerivation rec {
name = "digikam-1.2.0";
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
};
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" ];
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = [ lib.maintainers.viric ];
platforms = with lib.platforms; linux;
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}