python311Packages.onnx: use c++14 on darwin
This commit is contained in:
parent
9e2814201c
commit
a2a6075ea3
|
@ -66,10 +66,14 @@ in buildPythonPackage rec {
|
||||||
--replace 'include(googletest)' ""
|
--replace 'include(googletest)' ""
|
||||||
substituteInPlace cmake/unittest.cmake \
|
substituteInPlace cmake/unittest.cmake \
|
||||||
--replace 'googletest)' ')'
|
--replace 'googletest)' ')'
|
||||||
|
'' + lib.optionalString stdenv.isLinux ''
|
||||||
# remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags
|
# remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
|
--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 = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -7543,7 +7543,7 @@ self: super: with self; {
|
||||||
abseil-cpp = if stdenv.isLinux then
|
abseil-cpp = if stdenv.isLinux then
|
||||||
pkgs.abseil-cpp_202301
|
pkgs.abseil-cpp_202301
|
||||||
else
|
else
|
||||||
pkgs.abseil-cpp_202301.override { cxxStandard = "17"; };
|
pkgs.abseil-cpp_202301.override { cxxStandard = "14"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
|
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
|
||||||
|
|
Loading…
Reference in a new issue