gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pkgsStatic.protobuf: fix installation of protoc"

Browse Source 
This reverts commit 41963339b9.
This commit is contained in:
Tobias Mayer
2024-10-13 20:07:55 +02:00
parent acf6b15f94
commit ab670da1b6
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/protobuf/generic.nix
-2
View File
@@ -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 = [
pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch
-18
View File
@@ -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")