diff options
| author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
| commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
| tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/development/libraries/opencv/4.x.nix | |
| parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
| parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) | |
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/opencv/4.x.nix')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f96e6bf94bb01..85bb2f1effd98 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags protobuf ] + [ zlib pcre hdf5 glog boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 |