diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-23 17:59:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 17:59:23 -0500 |
| commit | 8449cc5b11a4f4c11772b83174c09f9aef7eb9b7 (patch) | |
| tree | daee74fbe3fcdf5f00e1527779669d6942aad9d3 /pkgs | |
| parent | 5629e9de9d03c88c303fd6fdb553296016065398 (diff) | |
| parent | f84e353831a3d951d63b0a3409ef262c206133e2 (diff) | |
| download | nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar.gz nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar.bz2 nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar.lz nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar.xz nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.tar.zst nixlib-8449cc5b11a4f4c11772b83174c09f9aef7eb9b7.zip | |
Merge pull request #53805 from mroi/patch-1
synergy: fix compilation on macOS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 4 | ||||
| -rw-r--r-- | 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 aba19f6287c4..556dfcf0c040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |