diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-01 18:08:28 +0200 |
---|---|---|
committer | Sergey Mironov <ierton@gmail.com> | 2013-04-04 12:02:53 +0400 |
commit | dd2cd2785e957471331f1fa5e2a4bb9d25d50297 (patch) | |
tree | fe0c5131f9e9b7519e1a86a7b4b377b4bc71accd /pkgs/development/libraries/libgphoto2 | |
parent | 7ce97cc443485c8d455312652dc0765f08107cf2 (diff) | |
download | nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar.gz nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar.bz2 nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar.lz nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar.xz nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.tar.zst nixlib-dd2cd2785e957471331f1fa5e2a4bb9d25d50297.zip |
libgphoto2: update and add libxml2
Diffstat (limited to 'pkgs/development/libraries/libgphoto2')
-rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 3edc8d0ac6ca..e1feda6abd4a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -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 ]; }; |