From 467608f614ce8f79d14309d0bf7d5ba8768c1bb3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 21 Jun 2013 13:46:22 +0200 Subject: [PATCH] synergy: Only pass cryptopp on Linux platforms. The second failure, and the last one I'm going to try today: http://hydra.nixos.org/build/5404634 On the bright side there is at least the fact that version 1.4.10 has failed on Darwin already, so I guess we don't have a lot of Mac users using Synergy. Latest (failed) build of 1.4.10: http://hydra.nixos.org/build/5359408 Signed-off-by: aszlig --- pkgs/applications/misc/synergy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index b283c0610293..0b3734ea147a 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput -, cryptopp, unzip ? null }: +, cryptopp ? null, unzip ? null }: +assert stdenv.isLinux -> cryptopp != null; assert !stdenv.isLinux -> unzip != null; with stdenv.lib; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip -d tools/cryptopp562 tools/cryptopp562.zip ''; - buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput cryptopp ]; + buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput ] + ++ optional stdenv.isLinux cryptopp; # At this moment make install doesn't work for synergy # http://synergy-foss.org/spit/issues/details/3317/