dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

python311Packages.onnx: use c++14 on darwin

Browse Source
This commit is contained in:
happysalada 2023-09-19 09:32:35 -04:00 committed by Yt
parent 9e2814201c
commit a2a6075ea3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/onnx/default.nix
View File

@ -66,10 +66,14 @@ in buildPythonPackage rec {
--replace 'include(googletest)' ""
substituteInPlace cmake/unittest.cmake \
--replace 'googletest)' ')'
# remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
'' + lib.optionalString stdenv.isLinux ''
# remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
'' + lib.optionalString stdenv.isDarwin ''
# remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14'
'';
preConfigure = ''

2
pkgs/top-level/python-packages.nix
View File

@ -7543,7 +7543,7 @@ self: super: with self; {
abseil-cpp = if stdenv.isLinux then
pkgs.abseil-cpp_202301
else
pkgs.abseil-cpp_202301.override { cxxStandard = "17"; };
pkgs.abseil-cpp_202301.override { cxxStandard = "14"; };
};
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {