diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 19:41:59 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 19:41:59 +0000 |
| commit | 3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a (patch) | |
| tree | 6fcf5ffc619d12e149a167fce461c52bc8a94e62 /pkgs/development/libraries/libgphoto2 | |
| parent | b4c7de3b7ef1346bd63eff6a7219ec4793d806e0 (diff) | |
| download | nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar.gz nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar.bz2 nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar.lz nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar.xz nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.tar.zst nixpkgs-3b672f9b7520294b1b0bf327316fcc5fe3bbfa2a.zip | |
(lib)gphoto-2.4.11
svn path=/nixpkgs/trunk/; revision=31412
Diffstat (limited to 'pkgs/development/libraries/libgphoto2')
| -rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch | 14 |
2 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 7ea9eb4db87..16001e689dd 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.10.1"; + name = "libgphoto2-2.4.11"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "12m99hcak59ppq1ijnfsrcm09mdj102f1xjmz4myggwjdymwc3lq"; + sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji"; }; - buildInputs = [pkgconfig libtool libjpeg gettext]; + buildNativeInputs = [ pkgconfig gettext ]; + buildInputs = [ libtool libjpeg ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [libusb libexif]; + propagatedBuildInputs = [ libusb libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; diff --git a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch b/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch deleted file mode 100644 index 8d39d663719..00000000000 --- a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN libgphoto2-2.2.1/packaging/generic/print-camera-list.c libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c ---- libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-04-19 03:54:05.000000000 +0200 -+++ libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c 2006-07-06 22:54:42.000000000 +0200 -@@ -48,8 +48,8 @@ - #include <time.h> - #include <string.h> - --#include <gphoto2/gphoto2-camera.h> --#include <gphoto2/gphoto2-port-log.h> -+#include <gphoto2-camera.h> -+#include <gphoto2-port-log.h> - - #ifndef TRUE - #define TRUE (0==0) |