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

* gphoto updated to 2.4.2.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12900
This commit is contained in:
Eelco Dolstra 2008-09-22 17:06:31 +00:00
parent 8d679b6351
commit ba6845d03e
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,21 @@
args: with args; { stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext
, libjpeg, readline, libtool
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gphoto2-2.4.0"; name = "gphoto2-2.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "1rf4w5m35dsi8dkwwnh4wg70xivdi9j79f2dy3rq90p1v8sar9ca"; sha256 = "0wna84rli816d830hirdv3ficr3q16zs471l725rgsdvc4pqrvy9";
}; };
buildInputs = [pkgconfig libgphoto2 libexif popt gettext];
# There is a bug in 2.4.0 configure.ac (in their m4 macroses) buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool];
patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
# 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,15 +1,16 @@
args: with args; {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgphoto2-2.4.0"; name = "libgphoto2-2.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0yfvpgfly774jnjrfqjf89h99az3sgvzkfpb9diygpk8hmx6phhd"; sha256 = "09jjfh9c7s02dxkwwr8j3kaqffsyiiz7ncbkmdvav1i14xdna6gk";
}; };
buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext]; buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext];
meta = { meta = {
license = "LGPL-2"; license = "LGPL-2";
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -6288,7 +6288,8 @@ let
}; };
gphoto2 = import ../applications/misc/gphoto2 { gphoto2 = import ../applications/misc/gphoto2 {
inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt readline gettext; inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt gettext
libjpeg readline libtool;
}; };
gqview = import ../applications/graphics/gqview { gqview = import ../applications/graphics/gqview {