nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <ludo@gnu.org>
This commit is contained in:
Rutger Helling 2017-11-15 12:22:44 +01:00 committed by Ludovic Courtès
parent d9cd1c2272
commit 42e52605d4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/xorg.scm
View File

@ -5973,6 +5973,9 @@ basic eye-candy effects.")
`(#:python ,python-2 ;; no full Python 3 support yet `(#:python ,python-2 ;; no full Python 3 support yet
#:configure-flags '("--with-tests" #:configure-flags '("--with-tests"
"--with-bundle_tests" "--with-bundle_tests"
"--without-opengl" ;; TODO: pygtkglext needed.
"--without-Xdummy" ;; We use Xvfb instead.
"--without-Xdummy_wrapper"
"--without-strict") "--without-strict")
#:modules ((guix build python-build-system) #:modules ((guix build python-build-system)
(guix build utils)) (guix build utils))
@ -6001,13 +6004,15 @@ basic eye-candy effects.")
(substitute* "setup.py" (substitute* "setup.py"
(("/usr/lib/") (("/usr/lib/")
(string-append (assoc-ref outputs "out") "/lib/"))) (string-append (assoc-ref outputs "out") "/lib/")))
(substitute* "./etc/xpra/conf.d/55_server_x11.conf.in" (substitute* "./xpra/scripts/config.py"
(("xvfb = %.*") ((":.*join.*xvfb.*")
(string-append "xvfb = " (string-append ": \"" (assoc-ref inputs "xorg-server")
(assoc-ref inputs "xorg-server") "/bin/Xvfb +extension Composite"
"/bin/Xvfb +extension Composite -nolisten tcp" " -screen 0 5760x2560x24+32 -dpi 96 -nolisten"
" -noreset -auth $XAUTHORITY" " tcp -noreset -auth $XAUTHORITY\",\n")))
" -screen 0 5760x2560x24+32"))) (substitute* "./xpra/scripts/config.py"
(("socket-dir.*: \"\",")
"socket-dir\" : \"~/.xpra\","))
#t))))) #t)))))
(home-page "https://www.xpra.org/") (home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops") (synopsis "Remote access to individual applications or full desktops")