diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-12-21 08:55:31 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-12-21 08:55:31 +0000 |
| commit | 1106d431fc247c8a3a0ead1b3b076dde36ee952a (patch) | |
| tree | debcb73f63cf6b28c160f62804a2bbdec058beb3 /pkgs/applications/misc/synergy | |
| parent | 8058166fe094e2a847c1458d3136c7f250f59f2e (diff) | |
| download | nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar.gz nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar.bz2 nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar.lz nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar.xz nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.tar.zst nixpkgs-1106d431fc247c8a3a0ead1b3b076dde36ee952a.zip | |
fix various builds by updating perl URI package update perl URI package
fix expect: Neither was the executable installed nor the shared library fix topGit source update synergy fixing build svn path=/nixpkgs/trunk/; revision=19064
Diffstat (limited to 'pkgs/applications/misc/synergy')
| -rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index eebbbe2edd2..f8c494cb8ed 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -2,24 +2,21 @@ args: with args; stdenv.mkDerivation { name = "synergy-cvs"; - # REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; } - src = sourceFromHead "synergy-F_09-55-29.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_09-55-28.tar.gz"; sha256 = "443bb8cf8d4e365b2adaadd8770096fcafa0c54532e83f6a267eb3b05042b84c"; }); + # 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 - /* - fetchcvs { - cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; - module = "synergy"; - date = "NOW"; - sha256 = "0a52b3adaae5f41cf16c5911c9037c5f2ee704a27bcaa9f874e3a4ff58d773c1"; - }; - */ - buildInputs = [x11 xextproto libXtst inputproto libXi]; + buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf]; + + preConfigure = "autoreconf; "; patches = [ (fetchurl { - url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz; - sha256 = "12kla0nii6qc9fy5x4dc4qisfcyl9dqnrj5y911davnvwkwlj18h"; + url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz; + sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7"; }) ]; meta= { |