diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b8995430f92..d7d1533b3be 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg_1, x264, libvpx, pil, libwebp }: +, ffmpeg, x264, libvpx, pil, libwebp }: buildPythonPackage rec { name = "xpra-0.9.5"; - + src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; }; - buildInputs = [ - python cython pkgconfig + buildInputs = [ + python cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -21,10 +21,10 @@ buildPythonPackage rec { pango cairo gdk_pixbuf atk gtk glib - ffmpeg_1 libvpx x264 libwebp + ffmpeg libvpx x264 libwebp ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ pil pygtk pygobject ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" python ./setup.py build --enable-Xdummy ''; - + meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X";