diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-29 19:29:18 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-29 21:50:02 +0200 |
commit | 8442c7d12230e5802258cbd7c683c2616e9e5dac (patch) | |
tree | a6ec93ff622213852f0f3438580b6cb8f0e25e80 /pkgs/development | |
parent | 4d682cc11201926cb60b7061d3f138e7ff1df277 (diff) | |
download | nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar.gz nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar.bz2 nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar.lz nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar.xz nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.tar.zst nixlib-8442c7d12230e5802258cbd7c683c2616e9e5dac.zip |
libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libgphoto2/2.4.nix | 30 | ||||
-rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 18 |
2 files changed, 38 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libgphoto2/2.4.nix b/pkgs/development/libraries/libgphoto2/2.4.nix new file mode 100644 index 000000000000..3edc8d0ac6ca --- /dev/null +++ b/pkgs/development/libraries/libgphoto2/2.4.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: + +stdenv.mkDerivation rec { + name = "libgphoto2-2.4.14"; + + src = fetchurl { + url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + }; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ libtool libjpeg ]; + + # These are mentioned in the Requires line of libgphoto's pkg-config file. + propagatedBuildInputs = [ libusb libexif ]; + + meta = { + homepage = http://www.gphoto.org/proj/libgphoto2/; + description = "A library for accessing digital cameras"; + longDescription = '' + This is the library backend for gphoto2. It contains the code for PTP, + MTP, and other vendor specific protocols for controlling and transferring data + from digital cameras. + ''; + # XXX: the homepage claims LGPL, but several src files are lgpl21Plus + license = stdenv.lib.licenses.lgpl21Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4a45804789b8..3edc8d0ac6ca 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.5.2"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg libxml2 ]; + buildInputs = [ libtool libjpeg ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb1 libexif ]; - - NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again + propagatedBuildInputs = [ libusb libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -22,10 +20,10 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; |