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/science/math/or-tools/default.nix | |
| parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
| parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) | |
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/science/math/or-tools/default.nix')
| -rw-r--r-- | pkgs/development/libraries/science/math/or-tools/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ba6827bf6947f..2dd63ebfc854f 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -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 ]; |