From b5d1d50aa90e0780c57fb4b323203ea5056be857 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 25 Jul 2019 09:04:55 +0000 Subject: 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. --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/opencv') 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 -- cgit 1.4.1