libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8.
This commit is contained in:
parent
4d682cc112
commit
8442c7d122
30
pkgs/development/libraries/libgphoto2/2.4.nix
Normal file
30
pkgs/development/libraries/libgphoto2/2.4.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
@ -4361,6 +4361,8 @@ let
|
|||
|
||||
libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
|
||||
|
||||
libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { };
|
||||
|
||||
libgpod = callPackage ../development/libraries/libgpod {
|
||||
inherit (pkgs.pythonPackages) mutagen;
|
||||
};
|
||||
|
@ -8679,12 +8681,14 @@ let
|
|||
boost = boost149;
|
||||
eigen = eigen2;
|
||||
libotr = libotr_3_2;
|
||||
libgphoto2 = libgphoto2_4;
|
||||
}) ../desktops/kde-4.7;
|
||||
|
||||
kde48 = kdePackagesFor (pkgs.kde48 // {
|
||||
boost = boost149;
|
||||
eigen = eigen2;
|
||||
libotr = libotr_3_2;
|
||||
libgphoto2 = libgphoto2_4;
|
||||
}) ../desktops/kde-4.8;
|
||||
|
||||
kde410 = kdePackagesFor (pkgs.kde410 // {
|
||||
|
|
Loading…
Reference in a new issue