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

update to 2.2.1. Also include a patch to fix a SNAFU by the maintainers, which are not willing to fix it (apparently)

Browse Source 
svn path=/nixpkgs/trunk/; revision=5626
This commit is contained in:
Armijn Hemel 2006-07-06 21:11:59 +00:00
parent 719429c592
commit 1789bf9944
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,13 @@
{stdenv, fetchurl, pkgconfig, libusb}: {stdenv, fetchurl, pkgconfig, libusb}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgphoto2-2.1.99"; name = "libgphoto2-2.2.1";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libgphoto2-2.1.99.tar.bz2; url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2;
md5 = "3c6d9cb65661915e07491a6f9215d5a9"; md5 = "69827311733e39fafa9f77bb05e55b77";
}; };
buildInputs = [pkgconfig libusb]; buildInputs = [pkgconfig libusb];
patches = [./libgphoto2-2.2.1.patch];
} }

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

@ -0,0 +1,14 @@
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)