Merge pull request #265671 from wegank/onnx-clang

python311Packages.onnx: fix build on darwin
This commit is contained in:
Weijia Wang 2023-11-06 02:10:21 +01:00 committed by GitHub
commit 2ee2d62dce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions

View file

@ -154,6 +154,13 @@ stdenv.mkDerivation rec {
"-Donnxruntime_ENABLE_PYTHON=ON"
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=deprecated-declarations"
"-Wno-error=unused-but-set-variable"
];
};
doCheck = true;
postPatch = ''

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
# build
, cmake
@ -22,6 +23,10 @@ let
};
patches = [
(fetchpatch {
url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch";
hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0=";
})
./espeak-mbrola.patch
];
});

View file

@ -66,14 +66,10 @@ in buildPythonPackage rec {
--replace 'include(googletest)' ""
substituteInPlace cmake/unittest.cmake \
--replace 'googletest)' ')'
'' + 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 = ''

View file

@ -8390,12 +8390,7 @@ self: super: with self; {
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
onnx = callPackage ../development/python-modules/onnx {
# in linux c++ defaults to 17
# on darwin clang is on an old version so c++ defaults to 11
abseil-cpp = if stdenv.isLinux then
pkgs.abseil-cpp_202301
else
pkgs.abseil-cpp_202301.override { cxxStandard = "14"; };
abseil-cpp = pkgs.abseil-cpp_202301;
};
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {