Unverified Commit 32b3a63e authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

or-tools, pybind11-protobuf: fix build with protobuf 34 (#501639)

parents 7d1d8357 f7e12b10

pkgs/by-name/or/or-tools/package.nix

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ stdenv.mkDerivation (finalAttrs: { 
    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib

  '';



  checkPhase = ''

    runHook preCheck

    ctest --output-on-failure -E "python_math_opt_.*"

    runHook postCheck

  '';



  # This extra configure step prevents the installer from littering

  # $out/bin with sample programs that only really function as tests,

  # and disables the upstream installation of a zipped Python egg that

pkgs/by-name/or/or-tools/pybind11-protobuf.nix

+7 −0
Original line number Diff line number Diff line
@@ -29,8 +29,15 @@ buildPythonPackage { 
  ];



  postPatch = ''

    # Original fix for version pinning

    substituteInPlace cmake/dependencies/CMakeLists.txt \

      --replace-fail 'find_package(protobuf 5.29.2 REQUIRED)' 'find_package(protobuf REQUIRED)'



    # Fix for Protobuf 34.0 (absl::string_view migration)

    substituteInPlace pybind11_protobuf/proto_cast_util.cc \

      --replace-fail "const std::string& filename" "absl::string_view filename" \

      --replace-fail "const std::string& symbol_name" "absl::string_view symbol_name" \

      --replace-fail "const std::string& containing_type" "absl::string_view containing_type"

  '';



  nativeBuildInputs = [ cmake ];