diff options
Diffstat (limited to 'pkgs/tools/X11/xpra/default.nix')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f779dd325b8c8..625dde8f825cc 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchFromGitHub , substituteAll , pkg-config , runCommand @@ -29,11 +29,13 @@ , pango , pulseaudio , python3 +, stdenv , util-linux , which , x264 , x265 , xauth +, xdg-utils , xorg , xorgserver }: @@ -68,11 +70,13 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.4.6"; + version = "5.0.9"; - src = fetchurl { - url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-BWf3nypfSrYCzpJ0OfBkecoHGbG1lEgu5jLZhfkIejQ="; + src = fetchFromGitHub { + owner = "Xpra-org"; + repo = "xpra"; + rev = "v${version}"; + hash = "sha256-gwo5plCAryGC8/BKVEqyMkgB+3FM8HXG6sESomDOtNM="; }; patches = [ @@ -84,6 +88,11 @@ in buildPythonApplication rec { ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace xpra/platform/posix/features.py \ + --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" + ''; + INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [ |