python310Packages.onnx: protobuf 3.x -> 4.x

NixOS · Sep 16, 2023 · a28fafd · a28fafd
1 parent fcbfef1
commit a28fafd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
@@ -13,6 +13,7 @@
 , pythonOlder
 , tabulate
 , typing-extensions
+, abseil-cpp
 }:
 
 let
@@ -36,6 +37,10 @@ in buildPythonPackage rec {
     pybind11
   ];
 
+  buildInputs = [
+    abseil-cpp
+  ];
+
   propagatedBuildInputs = [
     protobuf
     numpy
@@ -61,6 +66,9 @@ in buildPythonPackage rec {
       --replace 'include(googletest)' ""
     substituteInPlace cmake/unittest.cmake \
       --replace 'googletest)' ')'
+
+    substituteInPlace CMakeLists.txt \
+      --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
   '';
 
   preConfigure = ''

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -7509,9 +7509,7 @@ self: super: with self; {
 
   onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
 
-  onnx = callPackage ../development/python-modules/onnx {
-    protobuf = protobuf3;
-  };
+  onnx = callPackage ../development/python-modules/onnx { };
 
   onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
     protobuf = protobuf3;