nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Diego Nicola Barbato 2018-02-13 01:36:40 +01:00 committed by Ludovic Courtès
parent 8e60743d8b
commit 47551a761b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-aux/build-self.scm
View File

@ -44,6 +44,9 @@
;; could be renamed or shuffled around in modules over time. Conversely, ;; could be renamed or shuffled around in modules over time. Conversely,
;; 'find-best-packages-by-name' is expected to always have the same semantics. ;; '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 (define libgcrypt
(first (find-best-packages-by-name "libgcrypt" #f))) (first (find-best-packages-by-name "libgcrypt" #f)))
@ -165,8 +168,6 @@ files."
(if (defined? '%localstatedir) %localstatedir (dirname %state-directory))) (if (defined? '%localstatedir) %localstatedir (dirname %state-directory)))
(define sysconfdir (define sysconfdir
(if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory))) (if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory)))
(define sbindir
(if (defined? '%sbindir) %sbindir (dirname %guix-register-program)))
(define builder (define builder
#~(begin #~(begin
@ -222,7 +223,7 @@ files."
#:storedir #$storedir #:storedir #$storedir
#:localstatedir #$localstatedir #:localstatedir #$localstatedir
#:sysconfdir #$sysconfdir #:sysconfdir #$sysconfdir
#:sbindir #$sbindir #:sbindir (string-append #$guix "/sbin")
#:package-name #$%guix-package-name #:package-name #$%guix-package-name
#:package-version #$version #:package-version #$version