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

7
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}";
@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
}; };
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/;
@ -29,3 +29,4 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [ jcumming ]; maintainers = with stdenv.lib.maintainers; [ jcumming ];
}; };
} }