pull: Update the %sbindir variable in (guix config) when building.

[Diego Nicola Barbato]

Hello Guix,

The attached patch is supposed to fix <https://bugs.gnu.org/30370>.  I
am posting this here and not on guix-patches as I am not familiar with
the internals of guix and do not know what the intended behaviour of
this was.

I have checked that it actually fixes the problem.  However I do not
know if it breaks anything.

Greetings

Diego

>From 56d427eefe5c4667ed97b41f6411972b2c6ecc20 Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato <address@hidden>
Date: Tue, 13 Feb 2018 01:36:40 +0100
Subject: [PATCH] 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.
---
 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 17d947bec..4c85c09df 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
-- 
2.16.1