public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpra: depend on ffmpeg instead of ffmpeg_1, now default became 1+

Browse Source
This commit is contained in:
Mathijs Kwik 2013-12-16 14:32:25 +01:00
parent 70c2d2416b
commit 72ad48fd32
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/X11/xpra/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, buildPythonPackage { stdenv, fetchurl, buildPythonPackage
, python, cython, pkgconfig , python, cython, pkgconfig
, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
, ffmpeg_1, x264, libvpx, pil, libwebp }: , ffmpeg, x264, libvpx, pil, libwebp }:
buildPythonPackage rec { buildPythonPackage rec {
name = "xpra-0.9.5"; name = "xpra-0.9.5";
src = fetchurl { src = fetchurl {
url = "http://xpra.org/src/${name}.tar.bz2"; url = "http://xpra.org/src/${name}.tar.bz2";
sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw";
}; };
buildInputs = [ buildInputs = [
python cython pkgconfig python cython pkgconfig
xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
@ -21,10 +21,10 @@ buildPythonPackage rec {
pango cairo gdk_pixbuf atk gtk glib pango cairo gdk_pixbuf atk gtk glib
ffmpeg_1 libvpx x264 libwebp ffmpeg libvpx x264 libwebp
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pil pygtk pygobject 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)" 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 python ./setup.py build --enable-Xdummy
''; '';
meta = { meta = {
homepage = http://xpra.org/; homepage = http://xpra.org/;
description = "Persistent remote applications for X"; description = "Persistent remote applications for X";