Added gphoto2 support to kdegraphics

svn path=/nixpkgs/trunk/; revision=14471
This commit is contained in:
Sander van der Burg 2009-03-09 16:00:22 +00:00
parent f0614c79ff
commit 94371463b6
2 changed files with 3 additions and 3 deletions

View File

@ -102,7 +102,7 @@ rec {
}; };
kdegraphics = import ./graphics { kdegraphics = import ./graphics {
inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends gphoto2; inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends libgphoto2;
inherit (pkgs) libspectre djvulibre chmlib; inherit (pkgs) libspectre djvulibre chmlib;
inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs.xlibs) libXxf86vm;
poppler = pkgs.popplerQt4; poppler = pkgs.popplerQt4;

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, gphoto2, {stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, libgphoto2,
libspectre, poppler, djvulibre, chmlib, libXxf86vm, libspectre, poppler, djvulibre, chmlib, libXxf86vm,
kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2; url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2;
sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e"; sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e";
}; };
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends gphoto2 libspectre poppler chmlib buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
stdenv.gcc.libc libXxf86vm stdenv.gcc.libc libXxf86vm
kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
} }