diff options
| author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:04:55 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:18:32 +0000 |
| commit | b5d1d50aa90e0780c57fb4b323203ea5056be857 (patch) | |
| tree | 7f5977d5c5182cdbe83eac1db1edbef0e3a30cf4 /pkgs/development/libraries/opencv | |
| parent | 2f55e705e282753492dd81f73852781255a6ec81 (diff) | |
| download | nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar.gz nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar.bz2 nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar.lz nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar.xz nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.tar.zst nixpkgs-b5d1d50aa90e0780c57fb4b323203ea5056be857.zip | |
google-gflags: move to aliases.nix
google-gflags were renamed to gflags in 2012: https://github.com/gflags/gflags/#25-january-2012 gflags.name will be updated in staging.
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 43a68abf825..7055645fe89 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags ] + [ zlib pcre hdf5 glog boost gflags ] ++ lib.optional useSystemProtobuf protobuf ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f96e6bf94bb..85bb2f1effd 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 |