diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
| commit | 50ac037864dc0bedcea2bd6f8d420f71fa1e7347 (patch) | |
| tree | e4942eb779306ab89563dbfa5be423f4409e0a51 /pkgs/tools/X11 | |
| parent | b89ab32c60373ae4c8ca7b6604ea3445afabca85 (diff) | |
| parent | 6518480c1b6c3720eb899a5a1860fdb89c5735ec (diff) | |
| download | nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.gz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.bz2 nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.lz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.xz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.zst nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b8995430f92a..d7d1533b3be3 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"; |