summary refs log tree commit diff
path: root/pkgs/development/libraries/opencv
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-09-11 14:48:33 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-09-14 11:10:13 +0200
commitd7a0becf3709d3da1da00f74b34c19cdfbbb918f (patch)
tree81c5d1a8324a4f79a9fb21c7d467a061e672e828 /pkgs/development/libraries/opencv
parentaffcf2e03053366cdd0c68f0771c6abc68afa4ea (diff)
downloadnixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar.gz
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar.bz2
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar.lz
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar.xz
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.tar.zst
nixpkgs-d7a0becf3709d3da1da00f74b34c19cdfbbb918f.zip
opencv3: add enableContrib flag
If true, enable the repository of extra modules for OpenCV.
Build tested.

Based on patch from Bas van Dijk <v.dijk.bas@gmail.com>.
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r--pkgs/development/libraries/opencv/3.x.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 365f11f88f0..4a58ae43bb7 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,9 +1,19 @@
-{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
+{ lib, stdenv, fetchurl, fetchzip, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
 , enableIpp ? false
+, enableContrib ? false
 , enableBloat ? false }:
 
-let v = "3.0.0"; in
+let
+  v = "3.0.0";
+
+  contribSrc = fetchzip {
+    url = "https://github.com/Itseez/opencv_contrib/archive/3.0.0.tar.gz";
+    sha256 = "1gx7f9v85hmzh37s0zaillg7bs6cy9prm3wl0jb5zc5zrf9d8bm8";
+    name = "opencv-contrib-3.0.0-src";
+  };
+
+in
 
 stdenv.mkDerivation rec {
   name = "opencv-${v}";
@@ -33,7 +43,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  cmakeFlags = [ "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" ];
+  cmakeFlags = [
+    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ];
 
   enableParallelBuilding = true;