From a3187cbba2a41b341f9f2b906befc5ccf05a4ab0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 8 Jun 2013 16:51:43 +0400 Subject: [PATCH] Update libgphoto2 - fix gphotofs --- pkgs/development/libraries/libgphoto2/default.nix | 5 +++-- pkgs/development/libraries/libgphoto2/default.upstream | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libgphoto2/default.upstream diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 3edc8d0ac6c..af985ac91fc 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; + name = "libgphoto2-${meta.version}"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; + version = "2.5.2"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgphoto2/default.upstream b/pkgs/development/libraries/libgphoto2/default.upstream new file mode 100644 index 00000000000..0029e695930 --- /dev/null +++ b/pkgs/development/libraries/libgphoto2/default.upstream @@ -0,0 +1,9 @@ +url http://sourceforge.net/projects/gphoto/files/libgphoto/ +SF_version_dir +version_link '[.]tar[.]bz2/download$' +SF_redirect +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +}