or-tools: v6.9.1 -> v6.10
https://github.com/google/or-tools/releases/tag/v6.10
This commit is contained in:
parent
d97f3cb647
commit
c4feda8b01
1 changed files with 2 additions and 13 deletions
|
@ -3,13 +3,13 @@
|
|||
|
||||
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
|
||||
|
@ -33,17 +33,6 @@ stdenv.mkDerivation rec {
|
|||
make install_cc prefix=$out
|
||||
'';
|
||||
|
||||
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
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake lsb-release which zlib
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue