summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2014-12-19 10:41:01 +0100
committerlethalman <lucabru@src.gnome.org>2014-12-19 10:41:01 +0100
commitb5c379d26afe193e13bde86a82eec5047297848b (patch)
tree1d700cbb35785ffb32522b84704ff10657eac12e
parent6c5f112bd57fd25fed6523ddf7246b6386164701 (diff)
parentff7d9ae2f516e51fe1bd131503251968715eed6b (diff)
Merge pull request #5356 from flosse/opencv
nixpkg: opencv 2.4.9 -> 2.4.10
-rw-r--r--pkgs/development/libraries/opencv/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 45ac75340b12..775f7de9d612 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -2,14 +2,14 @@
, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
, enableBloat ? false }:
-let v = "2.4.9"; in
+let v = "2.4.10"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
- sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40";
+ sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v";
};
buildInputs =
@@ -20,11 +20,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ ];
+
meta = {
description = "Open Computer Vision Library with more than 500 algorithms";
- homepage = http://opencv.willowgarage.com/;
+ homepage = http://opencv.org/;
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [viric flosse];
platforms = with stdenv.lib.platforms; linux;
};
}