JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opencv3: don't download ippicv if not enabled

Browse Source 
On aarch64 ipp is not available but the derivation still tries to download it
leading to an error that the platform is not supported.

There is already an option to enable ipp which is disabled by default.
So the sensitive thing to do is to only download the ippicv package if
the option is enabled.

This makes opencv3 build on aarch64.
This commit is contained in:
Pascal Bach 2018-03-25 14:35:40 +02:00
parent f66a3b333c
commit 7ccbca6010
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/opencv/3.x.nix
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")