Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ffbad0f656da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83d179fc090f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 24, 2019

  1. xpra: 2.5 -> 2.5.3 

    Also fix build by using opencv4
    @adisbladis
    adisbladis committed Aug 24, 2019
    Copy the full SHA
    83d179f View commit details
Showing with 11 additions and 16 deletions.
  1. +3 −3 pkgs/tools/X11/xpra/default.nix
  2. +8 −13 pkgs/tools/X11/xpra/fix-paths.patch
6 changes: 3 additions & 3 deletions pkgs/tools/X11/xpra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ let
xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec {
pname = "xpra";
version = "2.5";
version = "2.5.3";

src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x";
sha256 = "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys";
};

patches = [
@@ -56,7 +56,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
pillow rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy pygobject3 pycairo gst-python pam
pyopengl paramiko opencv python-uinput pyxdg
pyopengl paramiko opencv4 python-uinput pyxdg
ipaddress idna
];

21 changes: 8 additions & 13 deletions pkgs/tools/X11/xpra/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
gdiff --git a/setup.py b/setup.py
index 8d3df15..6156206 100755
--- a/setup.py
+++ b/setup.py
@@ -1885,7 +1885,7 @@
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 @@
@@ -2359,10 +2359,7 @@ if v4l2_ENABLED:
v4l2_pkgconfig = pkgconfig()
#fuly warning: cython makes this difficult,
#we have to figure out if "device_caps" exists in the headers:
@@ -21,14 +14,16 @@
kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS}
make_constants("xpra", "codecs", "v4l2", "constants", **kwargs)
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
+++ 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 DFLT_XKB_RULES_FILE = b"base"
-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
+DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"

###################################
# Headers, python magic