From 04c22b32e559b90f3995e43d497403cf59438c1d Mon Sep 17 00:00:00 2001 From: pufferffish Date: Tue, 28 Nov 2023 09:30:49 +0000 Subject: [PATCH] remove the patch --- bindings/protobuf/default.nix | 3 +-- .../static-executables-have-no-rpath.patch | 18 ------------------ 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 bindings/protobuf/static-executables-have-no-rpath.patch diff --git a/bindings/protobuf/default.nix b/bindings/protobuf/default.nix index 51f3128..dbcf0e3 100644 --- a/bindings/protobuf/default.nix +++ b/bindings/protobuf/default.nix @@ -22,7 +22,7 @@ let owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; - sha256 = "honnvgmT1u26vv2AdtLfHou7B640PXaV3s0XXNkd/QE="; + sha256 = "honnvgmT1u36vv2AdtLfHou7B640PXaV3s0XXNkd/QE="; }; # re-create submodule logic @@ -46,7 +46,6 @@ let url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) - ./static-executables-have-no-rpath.patch ]; nativeBuildInputs = let diff --git a/bindings/protobuf/static-executables-have-no-rpath.patch b/bindings/protobuf/static-executables-have-no-rpath.patch deleted file mode 100644 index b896464..0000000 --- a/bindings/protobuf/static-executables-have-no-rpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake -index 998c2e31a..d1fe7a7ff 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -49,13 +49,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")