JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(lib)gphoto-2.4.11

Browse Source 
svn path=/nixpkgs/trunk/; revision=31412
This commit is contained in:
Yury G. Kudryashov 2012-01-07 19:41:59 +00:00
parent b4c7de3b7e
commit 3b672f9b75
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/gphoto2/default.nix
View File

@ -3,18 +3,16 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gphoto2-2.4.5"; name = "gphoto2-2.4.11";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0bjbgz9n7ijf8167i1bm7q3pg366axgx5zydck13d2znhd30x069"; sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y";
}; };
buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool]; buildNativeInputs = [ pkgconfig gettext ];
buildInputs = [ libgphoto2 libexif popt 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 = { meta = {
homepage = http://www.gphoto.org/; homepage = http://www.gphoto.org/;
}; };

9
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -1,17 +1,18 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgphoto2-2.4.10.1"; name = "libgphoto2-2.4.11";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "12m99hcak59ppq1ijnfsrcm09mdj102f1xjmz4myggwjdymwc3lq"; sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji";
}; };
buildInputs = [pkgconfig libtool libjpeg gettext]; buildNativeInputs = [ pkgconfig gettext ];
buildInputs = [ libtool libjpeg ];
# These are mentioned in the Requires line of libgphoto's pkg-config file. # These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [libusb libexif]; propagatedBuildInputs = [ libusb libexif ];
meta = { meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/; homepage = http://www.gphoto.org/proj/libgphoto2/;

14
pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
View File

@ -1,14 +0,0 @@
diff -ruN libgphoto2-2.2.1/packaging/generic/print-camera-list.c libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c
--- libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-04-19 03:54:05.000000000 +0200
+++ libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c 2006-07-06 22:54:42.000000000 +0200
@@ -48,8 +48,8 @@
#include <time.h>
#include <string.h>
-#include <gphoto2/gphoto2-camera.h>
-#include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2-camera.h>
+#include <gphoto2-port-log.h>
#ifndef TRUE
#define TRUE (0==0)