Unverified Commit f9981bba authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

grpc: fixup build on darwin after update 

This patch wouldn't apply since 8eed6803,
but apparently it's not needed anymore.
parent 01dff355

pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 053b9e3784..0979b504da 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -38083,3 +38083,6 @@ generate_pkgconfig(

   "-lgrpcpp_otel_plugin"

   "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"

   "grpcpp_otel_plugin.pc")

+

+target_link_options(upb_textformat_lib PRIVATE -Wl,-undefined,dynamic_lookup)

+target_link_options(upb_json_lib PRIVATE -Wl,-undefined,dynamic_lookup)

pkgs/by-name/gr/grpc/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ stdenv.mkDerivation (finalAttrs: { 
      url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch";

      hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8=";

    })

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654

    ./dynamic-lookup-darwin.patch

  ];



  nativeBuildInputs = [