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.
This commit is contained in:
Orivej Desh
2019-07-25 09:18:32 +00:00
parent 2f55e705e2
commit b5d1d50aa9
14 changed files with 31 additions and 31 deletions
@@ -1,6 +1,6 @@
{ stdenv, lib, config, fetchFromGitHub
, cmake
, glog, google-gflags, gtest
, glog, gflags, gtest
, protobuf, snappy
, python, future, six, python-protobuf, numpy, pydot
, eigen
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" ];
propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
buildInputs = [ glog google-gflags protobuf snappy eigen ]
buildInputs = [ glog gflags protobuf snappy eigen ]
++ lib.optional useCuda cudatoolkit
++ lib.optional useCudnn cudnn
++ lib.optional useOpenmp openmp
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, abseil-cpp, google-gflags, which
{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
, lsb-release, glog, protobuf, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig
, pythonProtobuf }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
cat <<EOF > Makefile.local
UNIX_ABSL_DIR=${abseil-cpp}
UNIX_GFLAGS_DIR=${google-gflags}
UNIX_GFLAGS_DIR=${gflags}
UNIX_GLOG_DIR=${glog}
UNIX_PROTOBUF_DIR=${protobuf}
UNIX_CBC_DIR=${cbc}
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
python.pkgs.setuptools python.pkgs.wheel
];
propagatedBuildInputs = [
abseil-cpp google-gflags glog protobuf cbc
abseil-cpp gflags glog protobuf cbc
pythonProtobuf python.pkgs.six
];