diff options
author | aszlig <aszlig@redmoonstudios.org> | 2013-06-21 06:20:45 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2013-06-21 12:17:53 +0200 |
commit | 57dee2a27e99bc9187e2c832f3e63082a05542d7 (patch) | |
tree | f339ba5ca2a1806aadc1a8d617f560bbab34cfe4 /pkgs/applications/misc/synergy/default.nix | |
parent | 1b8548fc725ea75a5ea5bf931e0fd70b685e54af (diff) | |
download | nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar.gz nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar.bz2 nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar.lz nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar.xz nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.tar.zst nixlib-57dee2a27e99bc9187e2c832f3e63082a05542d7.zip |
synergy: Update to new upstream version 1.4.12.
This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/misc/synergy/default.nix')
-rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 4bb3ef9e64a4..d650f964c2b9 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst }: +{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, cryptopp }: stdenv.mkDerivation rec { - name = "synergy-1.4.10"; + name = "synergy-1.4.12"; src = fetchurl { url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "1ghgf96gbk4sdw8sqlc3pjschkmmqybihi12mg6hi26gnk7a5m86"; + sha256 = "0j884skwqy8r8ckj9a4rlwsbjwb1yrj9wqma1nwhr2inff6hrdim"; }; - buildInputs = [ cmake x11 libX11 libXi libXtst ]; - + patches = [ ./cryptopp.patch ]; + + buildInputs = [ cmake x11 libX11 libXi libXtst cryptopp ]; + # At this moment make install doesn't work for synergy # http://synergy-foss.org/spit/issues/details/3317/ - installPhase = '' ensureDir $out/bin cp ../bin/synergyc $out/bin @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { cp ../bin/synergyd $out/bin ''; - meta = { + meta = { description = "Tool to share the mouse keyboard and the clipboard between computers"; homepage = http://synergy-foss.org; license = stdenv.lib.licenses.gpl2; |