aboutsummaryrefslogtreecommitdiff
path: root/pkgs/applications/misc/synergy
diff options
context:
space:
mode:
authorEduard Carreras <ecarreras@gisce.net>2012-10-15 14:26:44 +0200
committerEduard Carreras <ecarreras@gisce.net>2012-10-15 14:26:44 +0200
commit94471a459ffd79a1cd0e32e017844bd9b5e0b086 (patch)
tree01a78b1259f578ab4da7c1d9ba6de5f082119ed1 /pkgs/applications/misc/synergy
parent29980e0d547ad814fa252ffec7fd8ce8ab79596d (diff)
Updated synergy to 1.4.10-foss
Diffstat (limited to 'pkgs/applications/misc/synergy')
-rw-r--r--pkgs/applications/misc/synergy/default.nix41
1 files changed, 20 insertions, 21 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index cb79bf592fe..9708119ecf8 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi
-, automake, autoconf, sourceFromHead }:
+{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst }:
-stdenv.mkDerivation {
- name = "synergy-cvs";
+stdenv.mkDerivation rec {
+ name = "synergy-1.4.10";
- # note: There is a fork:
- # http://code.google.com/p/synergy-plus
-
- # REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
- src= sourceFromHead "synergy-F_23-55-02.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
- # END
-
- buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ];
+ src = fetchurl {
+ url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz";
+ sha256 = "1ghgf96gbk4sdw8sqlc3pjschkmmqybihi12mg6hi26gnk7a5m86";
+ };
- preConfigure = "autoreconf";
+ buildInputs = [ cmake x11 libX11 libXi libXtst ];
+
+ # At this moment make install doesn't work for synergy
+ # http://synergy-foss.org/spit/issues/details/3317/
- patches =
- [ (fetchurl {
- url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
- sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
- })
- ];
+
+ installPhase = ''
+ ensureDir $out/bin
+ pwd
+ cp ../bin/synergyc $out/bin
+ cp ../bin/synergys $out/bin
+ cp ../bin/synergyd $out/bin
+ '';
meta = {
description = "Tool to share the mouse keyboard and the clipboard between computers";
- homepage = http://synergy2.sourceforge.net;
+ homepage = http://synergy-foss.org;
license = "GPL";
};
}