From f9981bbabf15f281fea94f41a62ff1eb89ab111c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Apr 2026 10:59:08 +0200 Subject: [PATCH] grpc: fixup build on darwin after update This patch wouldn't apply since 8eed68037, but apparently it's not needed anymore. --- pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch | 11 ----------- pkgs/by-name/gr/grpc/package.nix | 4 ---- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch diff --git a/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch b/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch deleted file mode 100644 index d72ffcc72190..000000000000 --- a/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ -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) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index a53ac7f6623e..d326773e9391 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -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 = [