Merge pull request #53805 from mroi/patch-1

synergy: fix compilation on macOS
This commit is contained in:
Matthew Bauer 2019-01-23 17:59:23 -05:00 committed by GitHub
commit 8449cc5b11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private
, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
stdenv.mkDerivation rec {
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake curl openssl
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices Carbon Cocoa CoreServices ScreenSaver
ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private
] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
installPhase = ''

View File

@ -19561,6 +19561,7 @@ in
syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
synergy = callPackage ../applications/misc/synergy {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver;
};