nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 18:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #250882 from lopsided98/or-tools-protobuf

Browse Source 
or-tools: use protobuf 3.21
This commit is contained in:
K900 2023-08-27 09:04:52 +03:00 committed by GitHub
commit da9271825d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
abseil-cpp
protobuf
python.pkgs.protobuf
(python.pkgs.protobuf.override { protobuf = protobuf; })
python.pkgs.numpy
];
nativeCheckInputs = [

1
pkgs/top-level/all-packages.nix
View File

@ -39366,6 +39366,7 @@ with pkgs;
or-tools = callPackage ../development/libraries/science/math/or-tools {
python = python3;
protobuf = protobuf3_21;
# or-tools builds with -std=c++20, so abseil-cpp must
# also be built that way
abseil-cpp = abseil-cpp_202206.override {