mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg-server: Use /var as $localstatedir.

Browse source 
* gnu/packages/xorg.scm (xorg-server): Pass --localstatedir=/var.  In
  'configure' phase, patch 'hw/xfree86/Makefile.in'.
This commit is contained in:
Ludovic Courtès 2014-01-31 18:22:04 +01:00
parent fd3bfc44ff
commit e420308f29
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/xorg.scm
View file

@ -4377,7 +4377,10 @@ (define-public xorg-server
; the compiled keyboard maps go?
(string-append "--with-xkb-bin-directory="
(assoc-ref %build-inputs "xkbcomp")
"/bin"))
"/bin")
;; For the log file, etc.
"--localstatedir=/var")
#:phases
(alist-replace
'configure
@ -4385,6 +4388,12 @@ (define-public xorg-server
(let ((configure (assoc-ref %standard-phases 'configure)))
(substitute* (find-files "." "\\.c$")
(("/bin/sh") (which "sh")))
;; Don't try to 'mkdir /var'.
(substitute* "hw/xfree86/Makefile.in"
(("mkdir(.*)logdir.*")
"true\n"))
(apply configure args)))
%standard-phases)))
(home-page "http://www.x.org/wiki/")