From 57dee2a27e99bc9187e2c832f3e63082a05542d7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 06:20:45 +0200
Subject: [PATCH] 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>
---
 pkgs/applications/misc/synergy/cryptopp.patch | 54 +++++++++++++++++++
 pkgs/applications/misc/synergy/default.nix    | 15 +++---
 2 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/misc/synergy/cryptopp.patch

diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch
new file mode 100644
index 000000000000..f20ef9544a22
--- /dev/null
+++ b/pkgs/applications/misc/synergy/cryptopp.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b61fc0..2206646 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,9 @@ if (UNIX)
+ 	check_type_size(long SIZEOF_LONG)
+ 	check_type_size(short SIZEOF_SHORT)
+ 
++    # let's just assume cryptopp exists (provided by the Nix expression)
++    list(APPEND libs cryptopp)
++
+ 	# pthread is used on both Linux and Mac
+ 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ 	if (HAVE_PTHREAD)
+@@ -303,7 +306,6 @@ if (VNC_SUPPORT)
+ endif()
+ 
+ add_subdirectory(src)
+-add_subdirectory(tools)
+ 
+ if (WIN32)
+ 	# add /analyze in order to unconver potential bugs in the source code
+diff --git a/src/lib/synergy/CCryptoMode.h b/src/lib/synergy/CCryptoMode.h
+index 9b7e8ad..0d659ac 100644
+--- a/src/lib/synergy/CCryptoMode.h
++++ b/src/lib/synergy/CCryptoMode.h
+@@ -17,9 +17,9 @@
+ 
+ #pragma once
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+ 
+diff --git a/src/lib/synergy/CCryptoStream.h b/src/lib/synergy/CCryptoStream.h
+index 104b1f6..09c4dc4 100644
+--- a/src/lib/synergy/CCryptoStream.h
++++ b/src/lib/synergy/CCryptoStream.h
+@@ -20,8 +20,8 @@
+ #include "BasicTypes.h"
+ #include "CStreamFilter.h"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>
+ 
+ class CCryptoOptions;
+ 
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;