rhelling pushed a commit to branch master
in repository guix.
commit 4ecfc16839d103ba451cb88f9e51e2315d1564cc
Author: Rutger Helling <rhell...@mykolab.com>
Date: Mon Feb 19 12:54:06 2018 +0100
gnu: xpra: Disable abstract X11 sockets.
* gnu/packages/xorg.scm (xpra): Disable abstract X11 sockets.
---
gnu/packages/xorg.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d0861eb..f5af15e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2016 David Craven <da...@craven.ch>
;;; Copyright © 2016, 2017 John Darrington <j...@gnu.org>
;;; Copyright © 2017, 2018 Marius Bakke <mba...@fastmail.com>
-;;; Copyright © 2017 Rutger Helling <rhell...@mykolab.com>
+;;; Copyright © 2017, 2018 Rutger Helling <rhell...@mykolab.com>
;;; Copyright © 2017 Arun Isaac <arunis...@systemreboot.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <m...@tobias.gr>
;;;
@@ -6018,12 +6018,14 @@ basic eye-candy effects.")
(substitute* "setup.py"
(("/usr/lib/")
(string-append (assoc-ref outputs "out") "/lib/")))
+ ;; Use Xvfb with '-nolisten local' to disable abstract X11
sockets.
(substitute* "./xpra/scripts/config.py"
((":.*join.*xvfb.*")
(string-append ": \"" (assoc-ref inputs "xorg-server")
"/bin/Xvfb +extension Composite"
" -screen 0 5760x2560x24+32 -dpi 96 -nolisten"
- " tcp -noreset -auth $XAUTHORITY\",\n")))
+ " tcp -nolisten local -noreset -auth"
+ " $XAUTHORITY\",\n")))
(substitute* "./xpra/scripts/config.py"
(("socket-dir.*: \"\",")
"socket-dir\" : \"~/.xpra\","))
