Unverified Commit 2ee2d62d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #265671 from wegank/onnx-clang 

python311Packages.onnx: fix build on darwin
parents 9f755397 a749548a

pkgs/development/libraries/onnxruntime/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/libraries/piper-phonemize/default.nix

+5 −0
Original line number Diff line number Diff line 
{ 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

    ];

  });

pkgs/development/python-modules/onnx/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/python-packages.nix

+1 −6
Original line number Diff line number Diff line
@@ -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 {