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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "libgphoto2-2.4.14";
|
name = "libgphoto2-2.5.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||||
sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
|
sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig gettext ];
|
nativeBuildInputs = [ pkgconfig gettext ];
|
||||||
buildInputs = [ libtool libjpeg ];
|
buildInputs = [ libtool libjpeg libxml2 ];
|
||||||
|
|
||||||
# These are mentioned in the Requires line of libgphoto's pkg-config file.
|
# 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 = {
|
meta = {
|
||||||
homepage = http://www.gphoto.org/proj/libgphoto2/;
|
homepage = http://www.gphoto.org/proj/libgphoto2/;
|
||||||
|
Loading…
Reference in New Issue
Block a user