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

This commit is contained in:
Mathijs Kwik 2013-12-16 14:32:25 +01:00
parent 70c2d2416b
commit 72ad48fd32

View File

@ -1,7 +1,7 @@
{ 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";
@ -21,7 +21,7 @@ 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 = [