diff options
Diffstat (limited to 'pkgs/tools/X11/xpra/fix-41106.patch')
| -rw-r--r-- | pkgs/tools/X11/xpra/fix-41106.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/tools/X11/xpra/fix-41106.patch index d0834543aa9fa..81870fc1a2a14 100644 --- a/pkgs/tools/X11/xpra/fix-41106.patch +++ b/pkgs/tools/X11/xpra/fix-41106.patch @@ -1,15 +1,15 @@ diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py -index dd7c7c1..066b9ff 100644 +index f46998ee9f..60068f21b6 100644 --- a/xpra/server/server_util.py +++ b/xpra/server/server_util.py -@@ -37,6 +37,10 @@ def sh_quotemeta(s): - return b"'" + s.replace(b"'", b"'\\''") + b"'" +@@ -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, socket_dir): + 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 = [] - script.append(b"#!/bin/sh\n") - for var, value in os.environb.items(): + # 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. |