libgphoto2: update and add libxml2
This commit is contained in:
parent
7ce97cc443
commit
dd2cd2785e
@ -1,18 +1,20 @@
|
||||
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
|
||||
{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgphoto2-2.4.14";
|
||||
name = "libgphoto2-2.5.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
|
||||
sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
buildInputs = [ libtool libjpeg ];
|
||||
buildInputs = [ libtool libjpeg libxml2 ];
|
||||
|
||||
# These are mentioned in the Requires line of libgphoto's pkg-config file.
|
||||
propagatedBuildInputs = [ libusb libexif ];
|
||||
propagatedBuildInputs = [ libusb1 libexif ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gphoto.org/proj/libgphoto2/;
|
||||
@ -20,10 +22,10 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
This is the library backend for gphoto2. It contains the code for PTP,
|
||||
MTP, and other vendor specific protocols for controlling and transferring data
|
||||
from digital cameras.
|
||||
from digital cameras.
|
||||
'';
|
||||
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ jcumming ];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user