From 0d8b5be67d30478c0790c8facf0198c730c9a1b2 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Tue, 4 Apr 2017 22:50:59 -0400 Subject: [PATCH] xpra: 0.17.6 -> 2.0.1 Requires build against newer ffmpeg (3.2.x instead of 3.1.x) because of new symbols: FF_PROFILE_H264_MULTIVIEW_HIGH FF_PROFILE_H264_STEREO_HIGH --- pkgs/tools/X11/xpra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 943707c0c5ee..15feb30743b2 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf -, ffmpeg, x264, libvpx, libwebp +, ffmpeg_3_2, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection , pam }: @@ -11,11 +11,11 @@ with lib; let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.6"; + name = "xpra-2.0.1"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj"; + sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8"; }; buildInputs = [ @@ -28,7 +28,7 @@ in buildPythonApplication rec { pango cairo gdk_pixbuf atk gtk2 glib - ffmpeg libvpx x264 libwebp + ffmpeg_3_2 libvpx x264 libwebp gobjectIntrospection gst_all_1.gstreamer