nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xpra: adjust patches

Browse Source
This commit is contained in:
Louis Bettens
2020-05-22 08:17:36 +02:00
parent 79ac3258c9
commit 82ef74d010
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/X11/xpra/fix-41106.patch
View File

@@ -1,15 +1,15 @@
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
index 2ff2c0c..513201a 100644
index d6e71d6..6e185a2 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():
@@ -16,6 +16,10 @@ def sh_quotemeta(s):
return "'" + s.replace("'", "'\\''") + "'"
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("#!/bin/sh\n")
for var, value in os.environ.items():

2
pkgs/tools/X11/xpra/fix-paths.patch
View File

@@ -30,7 +30,7 @@ index bd7023d..064c6b5 100644
###################################
# Headers, python magic
diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py
index c867258..617af7c 100755
index 143db59..8e2d6ae 100755
--- a/xpra/x11/fakeXinerama.py
+++ b/xpra/x11/fakeXinerama.py
@@ -22,31 +22,7 @@ fakeXinerama_config_files = [