public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgphoto2: use libusb1 version (fixes build)

Browse Source 
Also, it's not mentioned in *.pc (anymore).
CC maint. @jcumming.
This commit is contained in:
Vladimír Čunát 2014-11-14 11:23:25 +01:00
parent c6ba65cd8d
commit 1e7709b68d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: { stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgphoto2-${meta.version}"; name = "libgphoto2-${meta.version}";
@ -7,12 +7,12 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0"; sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0";
}; };
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libtool libjpeg ]; buildInputs = [ libtool libjpeg libusb1 ];
# 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 = [ libexif ];
meta = { meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/; homepage = http://www.gphoto.org/proj/libgphoto2/;
@ -20,12 +20,13 @@ stdenv.mkDerivation rec {
longDescription = '' longDescription = ''
This is the library backend for gphoto2. It contains the code for PTP, This is the library backend for gphoto2. It contains the code for PTP,
MTP, and other vendor specific protocols for controlling and transferring data MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras. from digital cameras.
''; '';
version = "2.5.5.1"; version = "2.5.5.1";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus # 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; platforms = with stdenv.lib.platforms; unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ]; maintainers = with stdenv.lib.maintainers; [ jcumming ];
}; };
} }