[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: xpra: Fix paths.
From: |
Ludovic Courtès |
Subject: |
03/06: gnu: xpra: Fix paths. |
Date: |
Thu, 16 Nov 2017 04:44:16 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 42e52605d42adc42834274b6cd69863f4d717375
Author: Rutger Helling <address@hidden>
Date: Wed Nov 15 12:22:44 2017 +0100
gnu: xpra: Fix paths.
* gnu/packages/xorg.scm (xpra): [arguments]: Add '--without-opengl',
'--without-Xdummy' and '--without-Xdummy-wrapper' to #:configure-flags. Add
substitutions to #phases for proper paths.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/xorg.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 81f4e5d..994476e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5973,6 +5973,9 @@ basic eye-candy effects.")
`(#:python ,python-2 ;; no full Python 3 support yet
#:configure-flags '("--with-tests"
"--with-bundle_tests"
+ "--without-opengl" ;; TODO: pygtkglext needed.
+ "--without-Xdummy" ;; We use Xvfb instead.
+ "--without-Xdummy_wrapper"
"--without-strict")
#:modules ((guix build python-build-system)
(guix build utils))
@@ -6001,13 +6004,15 @@ basic eye-candy effects.")
(substitute* "setup.py"
(("/usr/lib/")
(string-append (assoc-ref outputs "out") "/lib/")))
- (substitute* "./etc/xpra/conf.d/55_server_x11.conf.in"
- (("xvfb = %.*")
- (string-append "xvfb = "
- (assoc-ref inputs "xorg-server")
- "/bin/Xvfb +extension Composite -nolisten tcp"
- " -noreset -auth $XAUTHORITY"
- " -screen 0 5760x2560x24+32")))
+ (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")))
+ (substitute* "./xpra/scripts/config.py"
+ (("socket-dir.*: \"\",")
+ "socket-dir\" : \"~/.xpra\","))
#t)))))
(home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops")
- branch master updated (304a53f -> 0b4dbb4), Ludovic Courtès, 2017/11/16
- 04/06: gnu: spectrwm: Update to 3.1.0., Ludovic Courtès, 2017/11/16
- 06/06: gnu: syslinux: Add explicit dependency on mtools., Ludovic Courtès, 2017/11/16
- 03/06: gnu: xpra: Fix paths.,
Ludovic Courtès <=
- 05/06: gnu: wget: Add wget2., Ludovic Courtès, 2017/11/16
- 01/06: gnu: messaging: Add libsignal-protocol-c., Ludovic Courtès, 2017/11/16
- 02/06: gnu: messaging: Enable OMEMO for dino., Ludovic Courtès, 2017/11/16