Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- gphoto2-2.4.14, libgphoto2-2.4.14 #165

Merged
merged 1 commit into from
Oct 21, 2012
Merged

- gphoto2-2.4.14, libgphoto2-2.4.14 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkgs/applications/misc/gphoto2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@
}:

stdenv.mkDerivation rec {
name = "gphoto2-2.4.11";
name = "gphoto2-2.4.14";

src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y";
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47";
};

buildNativeInputs = [ pkgconfig gettext ];
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];

meta = {
description = "a ready to use set of digital camera software applications";
longDescription = ''

A set of command line utilities for manipulating over 1400 different
digital cameras. Through libgphoto2, it supports PTP, MTP, and much more..

'';
homepage = http://www.gphoto.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}
16 changes: 13 additions & 3 deletions pkgs/development/libraries/libgphoto2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:

stdenv.mkDerivation rec {
name = "libgphoto2-2.4.11";
name = "libgphoto2-2.4.14";

src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji";
sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
};

buildNativeInputs = [ pkgconfig gettext ];
Expand All @@ -17,6 +17,16 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;
description = "A library for accessing digital cameras";
license = "LGPL 2.1";
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.
'';
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

# XXX: the homepage claims LGPL, and the several src files I audited were
# lgpl21Plus