gphoto2 upgraded to 2.4.0
svn path=/nixpkgs/trunk/; revision=9722
This commit is contained in:
parent
253f4d242a
commit
8294a83e5d
3 changed files with 23 additions and 20 deletions
|
@ -1,10 +1,12 @@
|
|||
{stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gphoto2-2.2.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gphoto2-2.4.0";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/gphoto/gphoto2-2.2.0.tar.bz2;
|
||||
md5 = "f5c1f83185db598b4ca52889964a5e84";
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "1rf4w5m35dsi8dkwwnh4wg70xivdi9j79f2dy3rq90p1v8sar9ca";
|
||||
};
|
||||
buildInputs = [pkgconfig libgphoto2 libexif popt];
|
||||
buildInputs = [pkgconfig libgphoto2 libexif popt gettext];
|
||||
# There is a bug in 2.4.0 configure.ac (in their m4 macroses)
|
||||
patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
|
||||
}
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{stdenv, fetchurl}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libexif-0.6.14";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libexif-0.6.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/libexif/libexif-0.6.14.tar.bz2;
|
||||
sha256 = "0pza5ysvbvvliz7al2i8l3yai64w09xwc6ivy2v5cl7k43almz84";
|
||||
url = "mirror://sourceforge/libexif/${name}.tar.bz2";
|
||||
sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
|
||||
};
|
||||
|
||||
patches = [./no-po.patch];
|
||||
buildInputs = [gettext];
|
||||
}
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
{stdenv, fetchurl, pkgconfig, libusb}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libgphoto2-2.2.1";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgphoto2-2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2;
|
||||
md5 = "69827311733e39fafa9f77bb05e55b77";
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "0yfvpgfly774jnjrfqjf89h99az3sgvzkfpb9diygpk8hmx6phhd";
|
||||
};
|
||||
buildInputs = [pkgconfig libusb];
|
||||
buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext];
|
||||
|
||||
## remove this patch when 2.2.2 is released
|
||||
patches = [./libgphoto2-2.2.1.patch];
|
||||
meta = {
|
||||
license = "LGPL-2";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue