public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121893 from lourkeur/update/xpra

Browse Source 
xpra: 4.0.6 -> 4.1.3
This commit is contained in:
Sandro 2021-05-17 01:07:57 +02:00 committed by GitHub
commit f30367b066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/X11/xpra/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText { lib, fetchurl, substituteAll, python3, pkg-config, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc
, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265 , ffmpeg, x264, libvpx, libwebp, x265
, libfakeXinerama , libfakeXinerama
@ -13,8 +13,11 @@ let
xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: {
patches = [ patches = [
# patch provided by Xpra upstream
./0002-Constant-DPI.patch ./0002-Constant-DPI.patch
# https://github.com/Xpra-org/xpra/issues/349
./0003-fix-pointer-limits.patch ./0003-fix-pointer-limits.patch
# patch provided by Xpra upstream
./0005-support-for-30-bit-depth-in-dummy-driver.patch ./0005-support-for-30-bit-depth-in-dummy-driver.patch
]; ];
}); });
@ -30,27 +33,27 @@ let
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "xpra"; pname = "xpra";
version = "4.0.6"; version = "4.1.3";
src = fetchurl { src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz"; url = "https://xpra.org/src/${pname}-${version}.tar.gz";
sha256 = "nGcvbZFGYd2nQ75LL4YN+xcWb7UsViA3OAqpcrTwieg="; sha256 = "TesmPRmfWy+IqqxoNFd04oX/b2ryGreZPeh2r4sL8JQ=";
}; };
patches = [ patches = [
(substituteAll { (substituteAll { # correct hardcoded paths
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit (xorg) xkeyboardconfig; inherit (xorg) xkeyboardconfig;
inherit libfakeXinerama; inherit libfakeXinerama;
}) })
./fix-41106.patch ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106
]; ];
postPatch = '' postPatch = ''
substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security'
''; '';
nativeBuildInputs = [ pkg-config wrapGAppsHook ]; nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ];
buildInputs = with xorg; [ buildInputs = with xorg; [
libX11 xorgproto libXrender libXi libX11 xorgproto libXrender libXi
libXtst libXfixes libXcomposite libXdamage libXtst libXfixes libXcomposite libXdamage