gnu: xorg-server: Use /var as $localstatedir.
* gnu/packages/xorg.scm (xorg-server): Pass --localstatedir=/var. In 'configure' phase, patch 'hw/xfree86/Makefile.in'.
This commit is contained in:
parent
fd3bfc44ff
commit
e420308f29
|
@ -4377,7 +4377,10 @@ (define-public xorg-server
|
||||||
; the compiled keyboard maps go?
|
; the compiled keyboard maps go?
|
||||||
(string-append "--with-xkb-bin-directory="
|
(string-append "--with-xkb-bin-directory="
|
||||||
(assoc-ref %build-inputs "xkbcomp")
|
(assoc-ref %build-inputs "xkbcomp")
|
||||||
"/bin"))
|
"/bin")
|
||||||
|
|
||||||
|
;; For the log file, etc.
|
||||||
|
"--localstatedir=/var")
|
||||||
#:phases
|
#:phases
|
||||||
(alist-replace
|
(alist-replace
|
||||||
'configure
|
'configure
|
||||||
|
@ -4385,6 +4388,12 @@ (define-public xorg-server
|
||||||
(let ((configure (assoc-ref %standard-phases 'configure)))
|
(let ((configure (assoc-ref %standard-phases 'configure)))
|
||||||
(substitute* (find-files "." "\\.c$")
|
(substitute* (find-files "." "\\.c$")
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
||||||
|
;; Don't try to 'mkdir /var'.
|
||||||
|
(substitute* "hw/xfree86/Makefile.in"
|
||||||
|
(("mkdir(.*)logdir.*")
|
||||||
|
"true\n"))
|
||||||
|
|
||||||
(apply configure args)))
|
(apply configure args)))
|
||||||
%standard-phases)))
|
%standard-phases)))
|
||||||
(home-page "http://www.x.org/wiki/")
|
(home-page "http://www.x.org/wiki/")
|
||||||
|
|
Loading…
Reference in a new issue