nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #265671 from wegank/onnx-clang

python311Packages.onnx: fix build on darwin

authored by

Weijia Wang and committed by
GitHub
2ee2d62d 9f755397

+14 -11
+7
pkgs/development/libraries/onnxruntime/default.nix
··· 154 154 "-Donnxruntime_ENABLE_PYTHON=ON" 155 155 ]; 156 156 157 + env = lib.optionalAttrs stdenv.cc.isClang { 158 + NIX_CFLAGS_COMPILE = toString [ 159 + "-Wno-error=deprecated-declarations" 160 + "-Wno-error=unused-but-set-variable" 161 + ]; 162 + }; 163 + 157 164 doCheck = true; 158 165 159 166 postPatch = ''
+5
pkgs/development/libraries/piper-phonemize/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 5 6 # build 6 7 , cmake ··· 23 22 }; 24 23 25 24 patches = [ 25 + (fetchpatch { 26 + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; 27 + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; 28 + }) 26 29 ./espeak-mbrola.patch 27 30 ]; 28 31 });
+1 -5
pkgs/development/python-modules/onnx/default.nix
··· 66 66 --replace 'include(googletest)' "" 67 67 substituteInPlace cmake/unittest.cmake \ 68 68 --replace 'googletest)' ')' 69 - '' + lib.optionalString stdenv.isLinux '' 69 + '' + '' 70 70 # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags 71 71 substituteInPlace CMakeLists.txt \ 72 72 --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' 73 - '' + lib.optionalString stdenv.isDarwin '' 74 - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags 75 - substituteInPlace CMakeLists.txt \ 76 - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' 77 73 ''; 78 74 79 75 preConfigure = ''
+1 -6
pkgs/top-level/python-packages.nix
··· 8390 8390 onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; 8391 8391 8392 8392 onnx = callPackage ../development/python-modules/onnx { 8393 - # in linux c++ defaults to 17 8394 - # on darwin clang is on an old version so c++ defaults to 11 8395 - abseil-cpp = if stdenv.isLinux then 8396 - pkgs.abseil-cpp_202301 8397 - else 8398 - pkgs.abseil-cpp_202301.override { cxxStandard = "14"; }; 8393 + abseil-cpp = pkgs.abseil-cpp_202301; 8399 8394 }; 8400 8395 8401 8396 onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {