public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

or-tools: 6.10 -> 7.0

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2019-03-26 15:29:28 -07:00
parent 8da6083b37
commit ae6b9dcb0e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/science/math/or-tools/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, google-gflags, which { stdenv, fetchFromGitHub, cmake, abseil-cpp, google-gflags, which
, lsb-release, glog, protobuf, cbc, zlib , lsb-release, glog, protobuf, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig , ensureNewerSourcesForZipFilesHook, python, swig
, pythonProtobuf }: , pythonProtobuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "or-tools-${version}"; name = "or-tools-${version}";
version = "v6.10"; version = "v7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = version; rev = version;
sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2"; sha256 = "09rs2j3w4ljw9qhhnsjlvfii297njjszwvkbgj1i6kns3wnlr7cp";
}; };
# The original build system uses cmake which does things like pull # The original build system uses cmake which does things like pull
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
# dependencies straight from nixpkgs and use the make build method. # dependencies straight from nixpkgs and use the make build method.
configurePhase = '' configurePhase = ''
cat <<EOF > Makefile.local cat <<EOF > Makefile.local
UNIX_ABSL_DIR=${abseil-cpp}
UNIX_GFLAGS_DIR=${google-gflags} UNIX_GFLAGS_DIR=${google-gflags}
UNIX_GLOG_DIR=${glog} UNIX_GLOG_DIR=${glog}
UNIX_PROTOBUF_DIR=${protobuf} UNIX_PROTOBUF_DIR=${protobuf}
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
python.pkgs.setuptools python.pkgs.wheel python.pkgs.setuptools python.pkgs.wheel
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
google-gflags glog protobuf cbc abseil-cpp google-gflags glog protobuf cbc
pythonProtobuf python.pkgs.six pythonProtobuf python.pkgs.six
]; ];