-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(cherry picked from commit 4459844)
- Loading branch information
Louis Bettens
committed
Jun 5, 2020
1 parent
cd6ea1d
commit 79ac325
Showing
2 changed files
with
16 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(): |