Commit d8fe893a authored by Weijia Wang's avatar Weijia Wang
Browse files

python311Packages.onnx: fix build on darwin

parent b746e126

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
@@ -8384,12 +8384,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 {