diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 11:23:25 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 11:25:20 +0100 |
commit | 1e7709b68dc102076ed5fded1471ef4963669e74 (patch) | |
tree | d9610855b5d7823b5813ea590e8a271136d1da61 /pkgs/development/libraries/libgphoto2 | |
parent | c6ba65cd8d97be10194b877850519a0ae1cd977f (diff) | |
download | nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar.gz nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar.bz2 nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar.lz nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar.xz nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.tar.zst nixlib-1e7709b68dc102076ed5fded1471ef4963669e74.zip |
libgphoto2: use libusb1 version (fixes build)
Also, it's not mentioned in *.pc (anymore). CC maint. @jcumming.
Diffstat (limited to 'pkgs/development/libraries/libgphoto2')
-rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index d739b0948743..24017d6f1c4b 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: +{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; + buildInputs = [ libtool libjpeg libusb1 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; + propagatedBuildInputs = [ libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -20,12 +20,13 @@ 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. ''; version = "2.5.5.1"; # 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 ]; }; } + |