diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch')
-rw-r--r-- | nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch b/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch index 06387c87154d..d0834543aa9f 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch +++ b/nixpkgs/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 2ff2c0c..513201a 100644 +index dd7c7c1..066b9ff 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(): +@@ -37,6 +37,10 @@ def sh_quotemeta(s): + 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(): |