diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/X11/xpra/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/X11/xpra/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix index 0d989fccb02..7f46e017c36 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg_4, x264, libvpx, libwebp, x265 +, ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -30,17 +30,18 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "3.0.9"; + version = "4.0.2"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "04qskz1x1pvbdfirpxk58d3dfnf1n6dc69q2rdkak0avzl1nlzi7"; + sha256 = "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x"; }; patches = [ (substituteAll { src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; + inherit libfakeXinerama; }) ./fix-41106.patch ]; @@ -59,7 +60,7 @@ in buildPythonApplication rec { pango cairo gdk-pixbuf atk.out gtk3 glib - ffmpeg_4 libvpx x264 libwebp x265 + ffmpeg libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -84,15 +85,17 @@ in buildPythonApplication rec { "--with-Xdummy" "--without-strict" "--with-gtk3" - "--without-gtk2" # Override these, setup.py checks for headers in /usr/* paths "--with-pam" "--with-vsock" ]; + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --set XPRA_INSTALL_PREFIX "$out" + --set XPRA_COMMAND "$out/bin/xpra" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} ) |