Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/guix/
Date: Wed, 08 Feb 2017 22:05:39
Message-Id: 1486591514.ddd177639dfede578d97a4dba8d3526ac6cfcb02.slyfox@gentoo
1 commit: ddd177639dfede578d97a4dba8d3526ac6cfcb02
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 8 21:49:40 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 8 22:05:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd17763
7
8 sys-apps/guix: fix 'localstatedir' to poin to /var/guix
9
10 The path is used by /gnu/store binaries and is expected
11 location for ebuild itself.
12
13 Package-Manager: Portage-2.3.3, Repoman-2.3.1
14
15 sys-apps/guix/{guix-0.12.0-r1.ebuild => guix-0.12.0-r2.ebuild} | 7 +++++++
16 1 file changed, 7 insertions(+)
17
18 diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild b/sys-apps/guix/guix-0.12.0-r2.ebuild
19 similarity index 95%
20 rename from sys-apps/guix/guix-0.12.0-r1.ebuild
21 rename to sys-apps/guix/guix-0.12.0-r2.ebuild
22 index 1cdbf8f156..5acef29608 100644
23 --- a/sys-apps/guix/guix-0.12.0-r1.ebuild
24 +++ b/sys-apps/guix/guix-0.12.0-r2.ebuild
25 @@ -97,6 +97,12 @@ pkg_setup() {
26 done
27 }
28
29 +src_configure() {
30 + # to be compatible with guix from /gnu/store
31 + econf \
32 + --localstatedir="${EPREFIX}"/var
33 +}
34 +
35 src_prepare() {
36 copy_boot_guile_binaries
37
38 @@ -116,6 +122,7 @@ src_install() {
39
40 readme.gentoo_create_doc
41
42 + keepdir /etc/guix
43 # TODO: will need a tweak for prefix
44 keepdir /gnu/store
45 fowners root:guixbuild /gnu/store