diff options
Diffstat (limited to 'pkgs/tools/X11/xpra/default.nix')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 23270793b34e..915144daa908 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python2Packages, pkgconfig +{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xorgserver, getopt, xauth, utillinux, which , ffmpeg, x264, libvpx, libwebp @@ -10,12 +10,14 @@ with lib; let inherit (python2Packages) cython buildPythonApplication; + + xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { - name = "xpra-${version}"; + pname = "xpra"; version = "2.3.3"; src = fetchurl { - url = "https://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${pname}-${version}.tar.xz"; sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; @@ -73,6 +75,7 @@ in buildPythonApplication rec { # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra #''; + passthru = { inherit xf86videodummy; }; meta = { homepage = http://xpra.org/; @@ -80,7 +83,7 @@ in buildPythonApplication rec { downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; platforms = platforms.linux; - maintainers = with maintainers; [ tstrobel offline ]; license = licenses.gpl2; + maintainers = with maintainers; [ tstrobel offline numinit ]; }; } |