mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-29 08:14:19 +00:00
or-tools: improve darwin build
This commit is contained in:
parent
dc2c173086
commit
ee1454fc7d
@ -2,6 +2,7 @@
|
||||
, bzip2
|
||||
, cbc
|
||||
, cmake
|
||||
, DarwinTools # sw_vers
|
||||
, eigen
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, fetchFromGitHub
|
||||
@ -72,6 +73,8 @@ stdenv.mkDerivation rec {
|
||||
python.pythonOnBuildForHost
|
||||
swig4
|
||||
unzip
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
DarwinTools
|
||||
] ++ (with python.pythonOnBuildForHost.pkgs; [
|
||||
pip
|
||||
mypy-protobuf
|
||||
|
@ -38174,6 +38174,7 @@ with pkgs;
|
||||
osi = callPackage ../development/libraries/science/math/osi { };
|
||||
|
||||
or-tools = callPackage ../development/libraries/science/math/or-tools {
|
||||
inherit (darwin) DarwinTools;
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
python = python3;
|
||||
protobuf = protobuf_21;
|
||||
|
Loading…
Reference in New Issue
Block a user