Merge pull request #87982 from lourkeur/fix_41106

xpra: fix #41106
This commit is contained in:
Jaka Hudoklin 2020-05-20 03:33:53 +00:00 committed by GitHub
commit f7394da48a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions

View file

@ -42,6 +42,7 @@ in buildPythonApplication rec {
src = ./fix-paths.patch;
inherit (xorg) xkeyboardconfig;
})
./fix-41106.patch
];
postPatch = ''

View file

@ -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():