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

build-system/gnu: Pass --localstatedir=/var --sharedstatedir=/com. 

Suggested by John Darrington <john@darrington.wattle.id.au>
and Mark H Weaver <mhw@netris.org>.

* guix/build/gnu-build-system.scm (configure): Pass --localstatedir=/var
  --sharedstatedir=/com.
* gnu/packages/admin.scm (dmd): Remove 'arguments' field.
* gnu/packages/avahi.scm (avahi): Remove --localstatedir flag.
* gnu/packages/glib.scm (dbus): Likewise.
* gnu/packages/package-management.scm (guix): Likewise.
* gnu/packages/pulseaudio.scm (pulseaudio): Likewise.
This commit is contained in:
Ludovic Courtès 2014-01-27 23:45:59 +01:00
parent d43547f12d
commit 65529e49ff
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/admin.scm
View File

@ -51,8 +51,6 @@
"07mddw0p62fcphwjzgb6rfa0pjz5sy6jzbha0sm2vc3rqf459jxg")) "07mddw0p62fcphwjzgb6rfa0pjz5sy6jzbha0sm2vc3rqf459jxg"))
(patches (list (search-patch "dmd-getpw.patch"))))) (patches (list (search-patch "dmd-getpw.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0))) (inputs `(("guile" ,guile-2.0)))
(synopsis "Daemon managing daemons") (synopsis "Daemon managing daemons")

3
gnu/packages/avahi.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,7 +44,6 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--with-distro=none" '(#:configure-flags '("--with-distro=none"
"--localstatedir=/var" ; for the DBus socket
"--disable-python" "--disable-python"
"--disable-mono" "--disable-mono"
"--disable-doxygen-doc" "--disable-doxygen-doc"

5
gnu/packages/glib.scm
View File

@ -67,10 +67,7 @@
(patches (list (search-patch "dbus-localstatedir.patch"))))) (patches (list (search-patch "dbus-localstatedir.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list ;; Install the system bus socket under /var. '(#:configure-flags (list ;; XXX: Fix the following to allow system-wide
"--localstatedir=/var"
;; XXX: Fix the following to allow system-wide
;; config. ;; config.
;; "--sysconfdir=/etc" ;; "--sysconfdir=/etc"

3
gnu/packages/package-management.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,7 +43,6 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
"--localstatedir=/var"
(string-append "--with-libgcrypt-prefix=" (string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs (assoc-ref %build-inputs
"libgcrypt"))) "libgcrypt")))

2
gnu/packages/pulseaudio.scm
View File

@ -148,7 +148,7 @@ parse JSON formatted strings back into the C representation of JSON objects.")
"pulseaudio-volume-test.patch"))))) "pulseaudio-volume-test.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc" `(#:configure-flags '(;;"--sysconfdir=/etc"
"--disable-oss-output") "--disable-oss-output")
#:phases (alist-cons-before #:phases (alist-cons-before
'check 'pre-check 'check 'pre-check

8
guix/build/gnu-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -142,6 +142,12 @@ makefiles."
,(string-append "CONFIG_SHELL=" bash) ,(string-append "CONFIG_SHELL=" bash)
,(string-append "SHELL=" bash) ,(string-append "SHELL=" bash)
,(string-append "--prefix=" prefix) ,(string-append "--prefix=" prefix)
;; Keep modifiable state directories outside of the
;; store (Autoconf 2.70 will add '--runstatedir'.)
"--localstatedir=/var"
"--sharedstatedir=/com"
"--enable-fast-install" ; when using Libtool "--enable-fast-install" ; when using Libtool
;; Produce multiple outputs when specific output names ;; Produce multiple outputs when specific output names