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

or-tools: v6.9.1 -> v6.10, touchups

1 files changed, 11 insertions, 20 deletions

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 5294c779a32b..415e57e5d3cf 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, cmake, google-gflags, which
-, lsb-release, glog, protobuf, cbc, zlib }:
+, lsb-release, glog, protobuf, cbc, zlib, python3 }:
 
 stdenv.mkDerivation rec {
   name = "or-tools-${version}";
-  version = "v6.9.1";
+  version = "v6.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = version;
-    sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+    sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
   };
 
   # The original build system uses cmake which does things like pull
@@ -25,32 +25,23 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  buildPhase = ''
-    make cc
-  '';
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+  buildFlags = [ "cc" ];
 
-  installPhase = ''
-    make install_cc prefix=$out
-  '';
+  checkTarget = "test_cc";
+  doCheck = true;
 
-  patches = [
-    # 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
-  ];
+  installTargets = [ "install_cc" ];
 
   nativeBuildInputs = [
-    cmake lsb-release which zlib
+    cmake lsb-release which zlib python3
   ];
   propagatedBuildInputs = [
     google-gflags glog protobuf cbc
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/google/or-tools;
     license = licenses.asl20;