3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch
2022-01-22 20:08:40 +01:00

16 lines
703 B
Diff

diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
index f46998ee9f..60068f21b6 100644
--- a/xpra/server/server_util.py
+++ b/xpra/server/server_util.py
@@ -157,6 +157,10 @@ def xpra_env_shell_script(socket_dir, env):
return b"\n".join(script)
def xpra_runner_shell_script(xpra_file, starting_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 = []
# We ignore failures in cd'ing, b/c it's entirely possible that we were
# started from some temporary directory and all paths are absolute.