diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 22:21:48 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:20 +0200 |
| commit | 29e68d765bf5d281a301c9295694618545d1f828 (patch) | |
| tree | 3eb1ce18f04df336ff2d539af6e2cff76cbab480 | |
| parent | a73bfdf3a77730283345cfdd69d4d719c3cc16d2 (diff) | |
| download | nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar.gz nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar.bz2 nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar.lz nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar.xz nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.tar.zst nixpkgs-29e68d765bf5d281a301c9295694618545d1f828.zip | |
synergy: fix darwin build
| -rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 25855c2a613..5f12bdb4dfc 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, cf-private +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , 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 cf-private + ApplicationServices Carbon Cocoa CoreServices ScreenSaver ] ++ 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 1008b2e9f13..bb3373a247f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20333,7 +20333,7 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; synergy = callPackage ../applications/misc/synergy { - inherit (darwin) cf-private; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; |