Commit a2a6075e authored by happysalada's avatar happysalada Committed by Yt
Browse files

python311Packages.onnx: use c++14 on darwin

parent 9e281420

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

+8 −4
Original line number Diff line number Diff line
@@ -66,10 +66,14 @@ 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 −1
Original line number Diff line number Diff line
@@ -7543,7 +7543,7 @@ self: super: with self; { 
    abseil-cpp = if stdenv.isLinux then

        pkgs.abseil-cpp_202301

      else

        pkgs.abseil-cpp_202301.override { cxxStandard = "17"; };

        pkgs.abseil-cpp_202301.override { cxxStandard = "14"; };

  };















  onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {