[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: pull: Update the %sbindir variable in (guix config) when building
From: |
Ludovic Courtès |
Subject: |
01/02: pull: Update the %sbindir variable in (guix config) when building. |
Date: |
Thu, 15 Feb 2018 09:40:59 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 47551a761bb110e0ae2402eaf014076fbe67af0f
Author: Diego Nicola Barbato <address@hidden>
Date: Tue Feb 13 01:36:40 2018 +0100
pull: Update the %sbindir variable in (guix config) when building.
Fixes <https://bugs.gnu.org/30370>.
* build-aux/build-self.scm (guix): New variable.
(builder): Use it.
Signed-off-by: Ludovic Courtès <address@hidden>
---
build-aux/build-self.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 17d947b..4c85c09 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -44,6 +44,9 @@
;; could be renamed or shuffled around in modules over time. Conversely,
;; 'find-best-packages-by-name' is expected to always have the same semantics.
+(define guix
+ (first (find-best-packages-by-name "guix" #f)))
+
(define libgcrypt
(first (find-best-packages-by-name "libgcrypt" #f)))
@@ -165,8 +168,6 @@ files."
(if (defined? '%localstatedir) %localstatedir (dirname %state-directory)))
(define sysconfdir
(if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory)))
- (define sbindir
- (if (defined? '%sbindir) %sbindir (dirname %guix-register-program)))
(define builder
#~(begin
@@ -222,7 +223,7 @@ files."
#:storedir #$storedir
#:localstatedir #$localstatedir
#:sysconfdir #$sysconfdir
- #:sbindir #$sbindir
+ #:sbindir (string-append #$guix "/sbin")
#:package-name #$%guix-package-name
#:package-version #$version