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
commit 71dd955e22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
'';
preConfigure =
installExtraFiles ippicv + (
lib.optionalString enableIpp (installExtraFiles ippicv) + (
lib.optionalString buildContrib ''
cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")