Merge pull request #198863 from Enzime/fix-synergy-m1-mac
synergy: fix build on aarch64-darwin
This commit is contained in:
commit
9cac1e1384
|
@ -26,6 +26,7 @@
|
|||
, avahi-compat
|
||||
|
||||
# MacOS / darwin
|
||||
, darwin
|
||||
, ApplicationServices
|
||||
, Carbon
|
||||
, Cocoa
|
||||
|
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# Without this OpenSSL from nixpkgs is not detected
|
||||
./darwin-non-static-openssl.patch
|
||||
] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [
|
||||
# We cannot include UserNotifications because of a build failure in the Apple SDK.
|
||||
# The functions used from it are already implicitly included anyways.
|
||||
./darwin-no-UserNotifications-includes.patch
|
||||
|
@ -76,6 +78,8 @@ stdenv.mkDerivation rec {
|
|||
Cocoa
|
||||
CoreServices
|
||||
ScreenSaver
|
||||
] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [
|
||||
darwin.apple_sdk.frameworks.UserNotifications
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
util-linux
|
||||
libselinux
|
||||
|
@ -97,7 +101,8 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";
|
||||
|
||||
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
|
||||
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}";
|
||||
# NSFilenamesPboardType is deprecated in 10.14+
|
||||
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue