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

xpra: 2.5 -> 2.5.3 

Also fix build by using opencv4
This commit is contained in:
adisbladis 2019-08-24 14:14:00 +01:00
parent ffbad0f656
commit 83d179fc09
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,11 +14,11 @@ let
xf86videodummy = callPackage ./xf86videodummy { }; xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "xpra"; pname = "xpra";
version = "2.5"; version = "2.5.3";
src = fetchurl { src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz"; url = "https://xpra.org/src/${pname}-${version}.tar.xz";
sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x"; sha256 = "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys";
}; };
patches = [ patches = [
@ -56,7 +56,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
pillow rencode pycrypto cryptography pycups lz4 dbus-python pillow rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy pygobject3 pycairo gst-python pam netifaces numpy pygobject3 pycairo gst-python pam
pyopengl paramiko opencv python-uinput pyxdg pyopengl paramiko opencv4 python-uinput pyxdg
ipaddress idna ipaddress idna
]; ];

17
pkgs/tools/X11/xpra/fix-paths.patch
View File

@ -1,15 +1,8 @@
gdiff --git a/setup.py b/setup.py
index 8d3df15..6156206 100755
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1885,7 +1885,7 @@ @@ -2359,10 +2359,7 @@ if v4l2_ENABLED:
if OSX:
pycairo = "py3cairo"
else:
- pycairo = "pycairo"
+ pycairo = "py3cairo"
cython_add(Extension("xpra.client.gtk3.cairo_workaround",
["xpra/client/gtk3/cairo_workaround.pyx"],
**pkgconfig(pycairo)
@@ -2363,10 +2363,7 @@
v4l2_pkgconfig = pkgconfig() v4l2_pkgconfig = pkgconfig()
#fuly warning: cython makes this difficult, #fuly warning: cython makes this difficult,
#we have to figure out if "device_caps" exists in the headers: #we have to figure out if "device_caps" exists in the headers:
@ -21,9 +14,11 @@
kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS}
make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) make_constants("xpra", "codecs", "v4l2", "constants", **kwargs)
cython_add(Extension("xpra.codecs.v4l2.pusher", cython_add(Extension("xpra.codecs.v4l2.pusher",
diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx
index bd7023d..064c6b5 100644
--- a/xpra/x11/bindings/keyboard_bindings.pyx --- a/xpra/x11/bindings/keyboard_bindings.pyx
+++ b/xpra/x11/bindings/keyboard_bindings.pyx +++ b/xpra/x11/bindings/keyboard_bindings.pyx
@@ -19,7 +19,7 @@ @@ -21,7 +21,7 @@ from libc.stdlib cimport free, malloc
DEF PATH_MAX = 1024 DEF PATH_MAX = 1024
DEF DFLT_XKB_RULES_FILE = b"base" DEF DFLT_XKB_RULES_FILE = b"base"