From ba6845d03e1d9a729094c9d409daab78f45bfbcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Sep 2008 17:06:31 +0000
Subject: [PATCH] * gphoto updated to 2.4.2.

svn path=/nixpkgs/trunk/; revision=12900
---
 pkgs/applications/misc/gphoto2/default.nix    | 19 ++++++++++++-------
 .../libraries/libgphoto2/default.nix          |  9 +++++----
 pkgs/top-level/all-packages.nix               |  3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index e6dad337eb31..0ce5f3217990 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -1,16 +1,21 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext
+, libjpeg, readline, libtool
+}:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.4.0";
+  name = "gphoto2-2.4.2";
+  
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1rf4w5m35dsi8dkwwnh4wg70xivdi9j79f2dy3rq90p1v8sar9ca";
+    sha256 = "0wna84rli816d830hirdv3ficr3q16zs471l725rgsdvc4pqrvy9";
   };
-  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";
+  
+  buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool];
+  
+  # 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";
 
   meta = {
-    homepage = http://www.gphoto.org;
+    homepage = http://www.gphoto.org/;
   };
 }
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 6e332117a2db..2e483b29a06c 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,15 +1,16 @@
-args: with args;
+{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "libgphoto2-2.4.0";
+  name = "libgphoto2-2.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0yfvpgfly774jnjrfqjf89h99az3sgvzkfpb9diygpk8hmx6phhd";
+    sha256 = "09jjfh9c7s02dxkwwr8j3kaqffsyiiz7ncbkmdvav1i14xdna6gk";
   };
+  
   buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext];
 
   meta = {
-	  license = "LGPL-2";
+    license = "LGPL-2";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 573a52b49745..c02033728e67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6288,7 +6288,8 @@ let
   };
 
   gphoto2 = import ../applications/misc/gphoto2 {
-    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt readline gettext;
+    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt gettext
+      libjpeg readline libtool;
   };
 
   gqview = import ../applications/graphics/gqview {