summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2012-06-05 15:19:49 +0200
committeraszlig <aszlig@redmoonstudios.org>2012-07-06 03:39:55 +0200
commitd802bacdd93adf52797e3066b66da62c35a9693d (patch)
tree71440a17241525fe19b126b9f9cc49fdca0c567d /pkgs/tools/X11
parentaf9924b92904a8ce6bcef44fa44fbdfe63ea5d5d (diff)
downloadnixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar.gz
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar.bz2
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar.lz
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar.xz
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.tar.zst
nixpkgs-d802bacdd93adf52797e3066b66da62c35a9693d.zip
xpra: New version from the fork.
This is because the original version is no longer in development, as stated on
the website at http://code.google.com/p/partiwm/wiki/xpra:

"This project is in deep hibernation; I haven't had time to devote for several
years now. If you are looking for xpra, you may prefer Antoine Martin's fork,
which receives more support. It is available at: http://xpra.org/"

So I guess its safe to switch over to that fork.
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/xpra/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index cf7692cc58a..9fc34a2cf3f 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,17 +1,15 @@
-{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}:
+{stdenv, fetchurl, pkgconfig, python, cython, pygtk, xlibs, gtk, ffmpeg, x264, libvpx, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "xpra-0.0.3";
+  name = "xpra-0.3.2";
   
   src = fetchurl {
-    url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz;
-    sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp";
+    url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
+    sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
   };
 
-  #src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3;
-
   buildInputs = [
-    pkgconfig python pyrex pygtk gtk makeWrapper
+    pkgconfig python cython pygtk gtk ffmpeg x264 libvpx makeWrapper
     xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
   ];
 
@@ -33,7 +31,7 @@ stdenv.mkDerivation {
   '';
   
   meta = {
-    homepage = http://partiwm.org/wiki/xpra;
+    homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
   };
 }