diff options
Diffstat (limited to 'pkgs/applications/misc/synergy/default.nix')
| -rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index c01d67943e57..8d914c262212 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,36 +1,38 @@ -{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput -, cryptopp ? null, unzip ? null }: +{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput, curl +, cryptopp ? null, unzip }: assert stdenv.isLinux -> cryptopp != null; -assert !stdenv.isLinux -> unzip != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.15"; + name = "synergy-1.5.0"; src = fetchurl { - url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "0l1mxxky9hacyva0npzkgkwg4wkmihzq3abdrds0w5f6is44adv4"; + url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz"; + sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6"; }; patches = optional stdenv.isLinux ./cryptopp.patch; - postPatch = if stdenv.isLinux then '' + postPatch = (if stdenv.isLinux then '' sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt '' else '' - ${unzip}/bin/unzip -d tools/cryptopp562 tools/cryptopp562.zip + ${unzip}/bin/unzip -d ext/cryptopp562 ext/cryptopp562.zip + '') + '' + ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip + ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip ''; - buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput ] + buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput curl ] ++ optional stdenv.isLinux cryptopp; # At this moment make install doesn't work for synergy # http://synergy-foss.org/spit/issues/details/3317/ installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ../bin/synergyc $out/bin cp ../bin/synergys $out/bin cp ../bin/synergyd $out/bin |