alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/applications/misc/synergy/macos_build_fix.patch

21 lines
770 B
Diff
Raw Normal View History

synergy: 1.8.8 -> 1.11.0 (#80138) This gets rid of a few patches that aren't needed any more, adds one to make the tests work again and updates the MacOS patch. It also introduces two builds - one with the Qt application and one without. The patch to get the tests working will be submitted upstream and hopefully not be needed for future releases.
2020-02-15 00:39:47 +00:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
synergy: 1.11.1 -> 1.13.1.41 (#123359)
2021-05-23 00:55:42 +01:00
index c1e78d1d..13639ba1 100644
synergy: 1.8.8 -> 1.11.0 (#80138) This gets rid of a few patches that aren't needed any more, adds one to make the tests work again and updates the MacOS patch. It also introduces two builds - one with the Qt application and one without. The patch to get the tests working will be submitted upstream and hopefully not be needed for future releases.
2020-02-15 00:39:47 +00:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
synergy: 1.11.1 -> 1.13.1.41 (#123359)
2021-05-23 00:55:42 +01:00
@@ -328,14 +328,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
synergy: 1.8.8 -> 1.11.0 (#80138) This gets rid of a few patches that aren't needed any more, adds one to make the tests work again and updates the MacOS patch. It also introduces two builds - one with the Qt application and one without. The patch to get the tests working will be submitted upstream and hopefully not be needed for future releases.
2020-02-15 00:39:47 +00:00
${OPENSSL_ROOT}/lib/libssl.lib
${OPENSSL_ROOT}/lib/libcrypto.lib
)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set (OPENSSL_ROOT /usr/local/opt/openssl)
- include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
- set (OPENSSL_LIBS
- ${OPENSSL_ROOT}/lib/libssl.a
- ${OPENSSL_ROOT}/lib/libcrypto.a
- )
synergy: 1.11.1 -> 1.13.1.41 (#123359)
2021-05-23 00:55:42 +01:00
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin|.*BSD|DragonFly")
synergy: 1.8.8 -> 1.11.0 (#80138) This gets rid of a few patches that aren't needed any more, adds one to make the tests work again and updates the MacOS patch. It also introduces two builds - one with the Qt application and one without. The patch to get the tests working will be submitted upstream and hopefully not be needed for future releases.
2020-02-15 00:39:47 +00:00
set (OPENSSL_LIBS ssl crypto)
else()
message (FATAL_ERROR "Couldn't find OpenSSL")
Copy permalink