Merge pull request #37765 from bachp/opencv3-aarch64

opencv3: don't download ippicv if not enabled
This commit is contained in:
Michael Raskin
2018-03-25 13:48:06 +00:00
committed by GitHub
+1 -1
View File
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
''; '';
preConfigure = preConfigure =
installExtraFiles ippicv + ( lib.optionalString enableIpp (installExtraFiles ippicv) + (
lib.optionalString buildContrib '' lib.optionalString buildContrib ''
cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")