Skip to content

Commit

Permalink
xpra: fix #41106
Browse files Browse the repository at this point in the history
(cherry picked from commit 4459844)
  • Loading branch information
Louis Bettens committed Jun 5, 2020
1 parent cd6ea1d commit 79ac325
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkgs/tools/X11/xpra/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ in buildPythonApplication rec {
inherit (xorg) xkeyboardconfig;
inherit libfakeXinerama;
})
./fix-41106.patch
];

postPatch = ''
Expand Down
15 changes: 15 additions & 0 deletions pkgs/tools/X11/xpra/fix-41106.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
index 2ff2c0c..513201a 100644
--- a/xpra/server/server_util.py
+++ b/xpra/server/server_util.py
@@ -17,6 +17,10 @@ if PYTHON3:
return b"'" + s.replace(b"'", b"'\\''") + b"'"

def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir):
+ # Nixpkgs contortion:
+ # xpra_file points to a shell wrapper, not to the python script.
+ dirname, basename = os.path.split(xpra_file)
+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
script = []
script.append(b"#!/bin/sh\n")
for var, value in os.environb.items():

0 comments on commit 79ac325

Please sign in to comment.