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

Making digikam build with kdeedu, to get the marble widget working to geolocate photos.

Browse Source 
svn path=/nixpkgs/trunk/; revision=20266
This commit is contained in:
Lluís Batlle i Rossell 2010-02-26 10:41:53 +00:00
parent df0922aab7
commit 72edd54741
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.3/default.nix
View File

@ -221,7 +221,7 @@ 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 lib 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;
}; };

4
pkgs/desktops/kde-4.3/extragear/digikam/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, { stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, kdeedu, gettext}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "digikam-1.1.0"; name = "digikam-1.1.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
includeAllQtDirs=true; includeAllQtDirs=true;
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 kdeedu ];
cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
meta = { meta = {
description = "Photo Management Program"; description = "Photo Management Program";