mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #7197 from siddhanathan/master
opencv: update to 2.4.11
This commit is contained in:
commit
8d737d7bc2
@ -2,21 +2,16 @@
|
||||
, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
|
||||
, enableBloat ? false }:
|
||||
|
||||
let v = "2.4.10"; in
|
||||
let v = "2.4.11"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencv-${v}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
|
||||
sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v";
|
||||
sha256 = "1shz5g7ahvbb41gprxzvavllf235qhx0fpkjd7iwa3gv83ym46dg";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff";
|
||||
sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn";
|
||||
})];
|
||||
|
||||
buildInputs =
|
||||
[ unzip libjpeg libpng libtiff ]
|
||||
++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
|
||||
|
Loading…
Reference in New Issue
Block a user