From f84e353831a3d951d63b0a3409ef262c206133e2 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Fri, 11 Jan 2019 16:12:22 +0100 Subject: [PATCH] synergy: fix compilation on macOS cf-private is needed to build on macOS --- pkgs/applications/misc/synergy/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfcd..25855c2a6130 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2ed083a28f..7a4baaf3c4a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19495,6 +19495,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; };