From 2d38aee71b55a0fa7c905a5dd2747392a905f93d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 06:49:23 -0400 Subject: [PATCH] xpra: Use new ffmpeg attribute It still builds, but it's a pythonPackage so who knows if it works right. Was breaking the tarball, though. Signed-off-by: Shea Levy --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 8427386fe86..e0881e5aa9b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg_1_1, x264, libvpx, pil, libwebp }: +, ffmpeg_1, x264, libvpx, pil, libwebp }: buildPythonPackage rec { name = "xpra-0.8.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { pango cairo gdk_pixbuf atk gtk glib - ffmpeg_1_1 libvpx x264 libwebp + ffmpeg_1 libvpx x264 libwebp ]; propagatedBuildInputs = [