2020-05-17 15:32:41 +01:00
|
|
|
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
|
2022-01-22 09:41:09 +00:00
|
|
|
index f46998ee9f..60068f21b6 100644
|
2020-05-17 15:32:41 +01:00
|
|
|
--- a/xpra/server/server_util.py
|
|
|
|
|
+++ b/xpra/server/server_util.py
|
2022-01-22 09:41:09 +00:00
|
|
|
@@ -157,6 +157,10 @@ def xpra_env_shell_script(socket_dir, env):
|
|
|
|
|
return b"\n".join(script)
|
2020-05-16 20:19:00 +01:00
|
|
|
|
2022-01-22 09:41:09 +00:00
|
|
|
def xpra_runner_shell_script(xpra_file, starting_dir):
|
2020-05-16 20:19:00 +01:00
|
|
|
+ # 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 = []
|
2022-01-22 09:41:09 +00:00
|
|
|
# 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.
|
