diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2020-05-20 03:33:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 03:33:53 +0000 |
| commit | f7394da48a21c8961d5264a892ca9c08237150df (patch) | |
| tree | 3ef33f79af6eb88b7c5449f155c10517fcc71725 /pkgs/tools | |
| parent | c5d076ef993ec238c35ba2521931599a00627ec7 (diff) | |
| parent | 4459844e799b499893cf3af0e21f84c56c0357ed (diff) | |
| download | nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar.gz nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar.bz2 nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar.lz nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar.xz nixlib-f7394da48a21c8961d5264a892ca9c08237150df.tar.zst nixlib-f7394da48a21c8961d5264a892ca9c08237150df.zip | |
Merge pull request #87982 from lourkeur/fix_41106
xpra: fix #41106
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/fix-41106.patch | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b33ca52146ca..0d989fccb02c 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -42,6 +42,7 @@ in buildPythonApplication rec { src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; }) + ./fix-41106.patch ]; postPatch = '' diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/tools/X11/xpra/fix-41106.patch new file mode 100644 index 000000000000..06387c87154d --- /dev/null +++ b/pkgs/tools/X11/xpra/fix-41106.patch @@ -0,0 +1,15 @@ +diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py +index 2ff2c0c..513201a 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(): |