lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #198863 from Enzime/fix-synergy-m1-mac

synergy: fix build on aarch64-darwin

authored by

Kim Lindberger and committed by
GitHub
9cac1e13 500bb8fe

+6 -1
+6 -1
pkgs/applications/misc/synergy/default.nix
··· 26 26 , avahi-compat 27 27 28 28 # MacOS / darwin 29 + , darwin 29 30 , ApplicationServices 30 31 , Carbon 31 32 , Cocoa ··· 48 49 patches = [ 49 50 # Without this OpenSSL from nixpkgs is not detected 50 51 ./darwin-non-static-openssl.patch 52 + ] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [ 51 53 # We cannot include UserNotifications because of a build failure in the Apple SDK. 52 54 # The functions used from it are already implicitly included anyways. 53 55 ./darwin-no-UserNotifications-includes.patch ··· 76 78 Cocoa 77 79 CoreServices 78 80 ScreenSaver 81 + ] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [ 82 + darwin.apple_sdk.frameworks.UserNotifications 79 83 ] ++ lib.optionals stdenv.isLinux [ 80 84 util-linux 81 85 libselinux ··· 97 101 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; 98 102 99 103 cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" 100 - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}"; 104 + # NSFilenamesPboardType is deprecated in 10.14+ 105 + ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}"; 101 106 102 107 doCheck = true; 103 108