Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py 2index f46998ee9f..60068f21b6 100644 3--- a/xpra/server/server_util.py 4+++ b/xpra/server/server_util.py 5@@ -157,6 +157,10 @@ def xpra_env_shell_script(socket_dir, env): 6 return b"\n".join(script) 7 8 def xpra_runner_shell_script(xpra_file, starting_dir): 9+ # Nixpkgs contortion: 10+ # xpra_file points to a shell wrapper, not to the python script. 11+ dirname, basename = os.path.split(xpra_file) 12+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped") 13 script = [] 14 # We ignore failures in cd'ing, b/c it's entirely possible that we were 15 # started from some temporary directory and all paths are absolute.