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

or-tools: 7.6 -> 7.7

Browse Source
This commit is contained in:
Pavol Rusnak 2020-06-24 21:48:01 +02:00
parent c09f880fc3
commit 7839270bb0
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
, lsb-release, glog, protobuf3_11, cbc, zlib , lsb-release, glog, protobuf, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig }: , ensureNewerSourcesForZipFilesHook, python, swig }:
let stdenv.mkDerivation rec {
protobuf = protobuf3_11;
pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; };
in stdenv.mkDerivation rec {
pname = "or-tools"; pname = "or-tools";
version = "7.6"; version = "7.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = "v${version}"; rev = "v${version}";
sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b"; sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv";
}; };
# The original build system uses cmake which does things like pull # The original build system uses cmake which does things like pull
@ -33,7 +29,7 @@ in stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
"PROTOBUF_PYTHON_DESC=${pythonProtobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
]; ];
buildFlags = [ "cc" "pypi_archive" ]; buildFlags = [ "cc" "pypi_archive" ];
@ -54,7 +50,7 @@ in stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
abseil-cpp gflags glog protobuf cbc abseil-cpp gflags glog protobuf cbc
pythonProtobuf python.pkgs.six python.pkgs.protobuf python.pkgs.six
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;