Author: urkud
Date: Sat Jan 7 19:41:59 2012
New Revision: 31412
URL: https://nixos.org/websvn/nix/?rev=31412&sc=1
Log:
(lib)gphoto-2.4.11
Deleted:
nixpkgs/trunk/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
Modified:
nixpkgs/trunk/pkgs/applications/misc/gphoto2/default.nix
nixpkgs/trunk/pkgs/development/libraries/libgphoto2/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/gphoto2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/gphoto2/default.nix Sat Jan 7
19:41:52 2012 (r31411)
+++ nixpkgs/trunk/pkgs/applications/misc/gphoto2/default.nix Sat Jan 7
19:41:59 2012 (r31412)
@@ -3,18 +3,16 @@
}:
stdenv.mkDerivation rec {
- name = "gphoto2-2.4.5";
+ name = "gphoto2-2.4.11";
src = fetchurl {
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 = {
homepage = http://www.gphoto.org/;
};
Modified: nixpkgs/trunk/pkgs/development/libraries/libgphoto2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libgphoto2/default.nix Sat Jan
7 19:41:52 2012 (r31411)
+++ nixpkgs/trunk/pkgs/development/libraries/libgphoto2/default.nix Sat Jan
7 19:41:59 2012 (r31412)
@@ -1,17 +1,18 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
stdenv.mkDerivation rec {
- name = "libgphoto2-2.4.10.1";
+ name = "libgphoto2-2.4.11";
src = fetchurl {
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.
- propagatedBuildInputs = [libusb libexif];
+ propagatedBuildInputs = [ libusb libexif ];
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
