diff options
| author | Diego Nicola Barbato <dnbarbato@posteo.de> | 2018-02-13 01:36:40 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-02-15 15:40:35 +0100 |
| commit | 47551a761bb110e0ae2402eaf014076fbe67af0f (patch) | |
| tree | 73a7af8f62c133484b1161e56bab04c4b8bc2f82 /build-aux | |
| parent | 8e60743d8b4114494787b873ad9e705b1b0e2595 (diff) | |
| download | guix-47551a761bb110e0ae2402eaf014076fbe67af0f.tar guix-47551a761bb110e0ae2402eaf014076fbe67af0f.tar.gz | |
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 <ludo@gnu.org>
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/build-self.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 17d947bec1..4c85c09df6 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 |