diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-16 13:14:26 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-16 13:14:26 -0500 |
| commit | 150062f19060687dbf8e2cbe6a22c2f8600e7c4e (patch) | |
| tree | 4c25afac34832d118407180d66121f1a2f0c761d /build-aux | |
| parent | 54a93355c22ab533743cd948cf7b57993c789686 (diff) | |
| parent | 6a3cf4e6c7d77634d67902215f0017c12455c6fb (diff) | |
| download | patches-150062f19060687dbf8e2cbe6a22c2f8600e7c4e.tar patches-150062f19060687dbf8e2cbe6a22c2f8600e7c4e.tar.gz | |
Merge branch 'master' into core-updates
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 |