opencv: update 2.4.7 -> 2.4.9

This commit is contained in:
Aristid Breitkreuz 2014-09-17 21:10:51 +02:00
parent 89438059ab
commit a4e643a5fe

View File

@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg { lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
, enableBloat ? false }: , enableBloat ? false }:
let v = "2.4.7"; in let v = "2.4.9"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opencv-${v}"; name = "opencv-${v}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz"; url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4"; sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40";
}; };
buildInputs = buildInputs =
[ libjpeg libpng libtiff ] [ unzip libjpeg libpng libtiff ]
++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];