forked from mirrors/nixpkgs
Merge pull request #24644 from calvertvl/update-xpra-2_0
xpra: 0.17.6 -> 2.0.1
This commit is contained in:
commit
00be1f982f
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, lib, fetchurl, python2Packages, pkgconfig
|
{ stdenv, lib, fetchurl, python2Packages, pkgconfig
|
||||||
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
|
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
|
||||||
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
|
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
|
||||||
, ffmpeg, x264, libvpx, libwebp
|
, ffmpeg_3_2, x264, libvpx, libwebp
|
||||||
, libfakeXinerama
|
, libfakeXinerama
|
||||||
, gst_all_1, pulseaudioLight, gobjectIntrospection
|
, gst_all_1, pulseaudioLight, gobjectIntrospection
|
||||||
, pam }:
|
, pam }:
|
||||||
|
@ -11,11 +11,11 @@ with lib;
|
||||||
let
|
let
|
||||||
inherit (python2Packages) python cython buildPythonApplication;
|
inherit (python2Packages) python cython buildPythonApplication;
|
||||||
in buildPythonApplication rec {
|
in buildPythonApplication rec {
|
||||||
name = "xpra-0.17.6";
|
name = "xpra-2.0.1";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://xpra.org/src/${name}.tar.xz";
|
url = "http://xpra.org/src/${name}.tar.xz";
|
||||||
sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj";
|
sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -28,7 +28,7 @@ in buildPythonApplication rec {
|
||||||
|
|
||||||
pango cairo gdk_pixbuf atk gtk2 glib
|
pango cairo gdk_pixbuf atk gtk2 glib
|
||||||
|
|
||||||
ffmpeg libvpx x264 libwebp
|
ffmpeg_3_2 libvpx x264 libwebp
|
||||||
|
|
||||||
gobjectIntrospection
|
gobjectIntrospection
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
|
|
Loading…
Reference in a new issue