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

opencv3: don't depend on caffe

Browse Source 
It's needed only for tests (which we don't run) and creates a circular
dependency.
This commit is contained in:
Nikolay Amiantov 2018-02-25 20:04:52 +03:00
parent 8efee579c9
commit 24cc05e10a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/opencv/3.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchurl, fetchFromGitHub, fetchpatch , fetchurl, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, unzip, zlib, pcre, hdf5 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
, caffe, glog, boost, google-gflags, protobuf , glog, boost, google-gflags, protobuf
, config , config
, enableJPEG ? true, libjpeg , enableJPEG ? true, libjpeg
@ -188,7 +188,6 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib pcre hdf5 glog boost google-gflags protobuf ] [ zlib pcre hdf5 glog boost google-gflags protobuf ]
++ lib.optional (!stdenv.isDarwin) caffe
++ lib.optional enablePython pythonPackages.python ++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3 ++ lib.optional enableGtk3 gtk3
@ -227,6 +226,8 @@ stdenv.mkDerivation rec {
"-DBUILD_PROTOBUF=OFF" "-DBUILD_PROTOBUF=OFF"
"-DPROTOBUF_UPDATE_FILES=ON" "-DPROTOBUF_UPDATE_FILES=ON"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=OFF"
"-DBUILD_PERF_TESTS=OFF"
(opencvFlag "IPP" enableIpp) (opencvFlag "IPP" enableIpp)
(opencvFlag "TIFF" enableTIFF) (opencvFlag "TIFF" enableTIFF)
(opencvFlag "JASPER" enableJPEG2K) (opencvFlag "JASPER" enableJPEG2K)