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

Merge pull request #51336 from dtzWill/update/or-tools-6.10 

or-tools: v6.9.1 -> v6.10, touchups
This commit is contained in:
Jörg Thalheim 2018-12-02 00:07:42 +00:00 committed by GitHub
parent a742598378 cd14ad53c3
commit 8a5c9882cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, google-gflags, which { stdenv, fetchFromGitHub, cmake, google-gflags, which
, lsb-release, glog, protobuf, cbc, zlib }: , lsb-release, glog, protobuf, cbc, zlib, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "or-tools-${version}"; name = "or-tools-${version}";
version = "v6.9.1"; version = "v6.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = version; rev = version;
sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c"; sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
}; };
# The original build system uses cmake which does things like pull # The original build system uses cmake which does things like pull
@ -25,32 +25,23 @@ stdenv.mkDerivation rec {
EOF EOF
''; '';
buildPhase = '' makeFlags = [ "prefix=${placeholder "out"}" ];
make cc buildFlags = [ "cc" ];
'';
installPhase = '' checkTarget = "test_cc";
make install_cc prefix=$out doCheck = true;
'';
patches = [ installTargets = [ "install_cc" ];
# In "expected" way of compilation, the glog package is compiled
# with gflags support which then makes gflags header transitively
# included through glog. However in nixpkgs we don't compile glog
# with gflags so we have to include it ourselves. Upstream should
# always include gflags to support both ways I think.
#
# Upstream ticket: https://github.com/google/or-tools/issues/902
./gflags-include.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake lsb-release which zlib cmake lsb-release which zlib python3
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
google-gflags glog protobuf cbc google-gflags glog protobuf cbc
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/google/or-tools; homepage = https://github.com/google/or-tools;
license = licenses.asl20; license = licenses.asl20;