From b4ad13f667143a444a82fd9da5b46d65ff32a26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 1 Sep 2015 14:53:32 +0200 Subject: [PATCH] opencv: add version 3.0 Adding as a separate expression, as it is not api compatible with 2.x. --- pkgs/development/libraries/opencv/3.x.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/opencv/3.x.nix diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix new file mode 100644 index 000000000000..eae31df47964 --- /dev/null +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip +, enableBloat ? false }: + +let v = "3.0.0"; in + +stdenv.mkDerivation rec { + name = "opencv-${v}"; + + src = fetchurl { + url = "https://github.com/Itseez/opencv/archive/${v}.zip"; + sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287"; + }; + + buildInputs = + [ unzip libjpeg libpng libtiff ] + ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = { + description = "Open Computer Vision Library with more than 500 algorithms"; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4377ccafa099..c313641bbbdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7790,6 +7790,8 @@ let libpng = libpng12; }; + opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl;