diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2017-06-25 20:56:42 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2017-06-25 23:53:09 +0800 |
| commit | a4b9392151cde04a0145df79ecad2eb4e5e7c517 (patch) | |
| tree | 83fecad1e1c0487822bbdabd03bce5a2ec125058 /gnu/packages | |
| parent | 1a80e4d7fc718bc6a7295ab6f7ab5ddb13dabc74 (diff) | |
| download | guix-a4b9392151cde04a0145df79ecad2eb4e5e7c517.tar guix-a4b9392151cde04a0145df79ecad2eb4e5e7c517.tar.gz | |
gnu: libvirt: Use /etc as the sysconfdir.
* gnu/packages/qemu.scm (libvirt)[arguments]: Add '--sysconfdir=/etc' to
configure flags. Replace the 'do-not-mkdir-in-/var' phase with a modified
'install' phase.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/qemu.scm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 6838550033..8e04f20e0c 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -289,6 +289,7 @@ all common programming languages. Vala bindings are also provided.") #:tests? #f #:configure-flags (list "--with-polkit" + "--sysconfdir=/etc" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -299,16 +300,14 @@ all common programming languages. Vala bindings are also provided.") "gnulib/tests/test-posix_spawn2.c") (("/bin/sh") (which "sh"))) #t)) - (add-after 'unpack 'do-not-mkdir-in-/var - ;; Since the localstatedir should be /var at runtime, we must - ;; prevent writing to /var at installation time. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (localstatedir (string-append out "/var"))) - (substitute* '("src/Makefile.in" - "daemon/Makefile.in") - (("\\$\\(DESTDIR\\)\\$\\(localstatedir)") localstatedir))) - #t))))) + (replace 'install + ;; Since the sysconfdir and localstatedir should be /etc and /var + ;; at runtime, we must prevent writing to them at installation + ;; time. + (lambda _ + (zero? (system* "make" "install" + "sysconfdir=/tmp/etc" + "localstatedir=/tmp/var"))))))) (inputs `(("libxml2" ,libxml2) ("gnutls" ,gnutls) |