diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-16 17:28:17 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-16 17:28:17 +0000 |
commit | 8294a83e5df6538cf8b2b749e91f0e3727448071 (patch) | |
tree | 5339d7c17ebf77b7d1756f0a5975f91dad05afcb /pkgs/development/libraries | |
parent | 253f4d242a45eab56f553f3a7dbd5ef5273e186e (diff) | |
download | nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar.gz nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar.bz2 nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar.lz nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar.xz nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.tar.zst nixpkgs-8294a83e5df6538cf8b2b749e91f0e3727448071.zip |
gphoto2 upgraded to 2.4.0
svn path=/nixpkgs/trunk/; revision=9722
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/libexif/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 17 |
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 0a63ffda2af..76434d2c30b 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -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]; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 78372330a94..6e332117a2d 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -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"; + }; } |