From 13639d24ef3cf84c04e97a262241a0bc1c76deb9 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 31 Dec 2017 13:22:50 +0100 Subject: [PATCH] opencv: support optional unfree algorithms --- pkgs/development/libraries/opencv/3.x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index ac8befc8811..934181aa9ce 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,6 +15,7 @@ , enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableUnfree ? false , enableIpp ? false , enableContrib ? false , enablePython ? false, pythonPackages @@ -141,8 +142,9 @@ let dst = ".cache/tiny_dnn"; }; - opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}"; + opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; + printEnabled = enabled : if enabled then "ON" else "OFF"; in stdenv.mkDerivation rec { @@ -216,6 +218,7 @@ stdenv.mkDerivation rec { "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" "-DPROTOBUF_UPDATE_FILES=ON" + "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -249,7 +252,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; - license = stdenv.lib.licenses.bsd3; + license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; };