From ab670da1b6fb00dbb60166c0db1e4f7788c3ba2e Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 13 Oct 2024 20:06:58 +0200
Subject: [PATCH] Revert "pkgsStatic.protobuf: fix installation of protoc"

This reverts commit 41963339b973da3e3782e227aee22e3537f21909.
---
 .../development/libraries/protobuf/generic.nix |  2 --
 .../static-executables-have-no-rpath.patch     | 18 ------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch

diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 459f54b2457a..5e212e7f6f54 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -46,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch";
       hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ=";
     })
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
-    ./static-executables-have-no-rpath.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch
deleted file mode 100644
index cd2474e14590..000000000000
--- a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index 26a55be8b..b6823c3f9 100644
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES)
-   install(TARGETS protoc EXPORT protobuf-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc
-     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
--  if (UNIX AND NOT APPLE)
--    set_property(TARGET protoc
--      PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
--  elseif (APPLE)
--    set_property(TARGET protoc
--      PROPERTY INSTALL_RPATH "@loader_path/../lib")
--  endif()
- endif (protobuf_BUILD_PROTOC_BINARIES)
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")