summary refs log tree commit diff
path: root/pkgs/applications/misc/gphoto2
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-09-22 17:06:31 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-09-22 17:06:31 +0000
commitba6845d03e1d9a729094c9d409daab78f45bfbcb (patch)
treefcb0a53b37fd026b0ae755d3d99f431f8abd3586 /pkgs/applications/misc/gphoto2
parent8d679b635169085943b40b5771b110bd2dcc35e9 (diff)
downloadnixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar.gz
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar.bz2
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar.lz
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar.xz
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.tar.zst
nixlib-ba6845d03e1d9a729094c9d409daab78f45bfbcb.zip
* gphoto updated to 2.4.2.
svn path=/nixpkgs/trunk/; revision=12900
Diffstat (limited to 'pkgs/applications/misc/gphoto2')
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix19
1 files changed, 12 insertions, 7 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/;
   };
 }