aboutsummaryrefslogtreecommitdiff
path: root/config-daemon.ac
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-03-14 17:37:20 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-03-14 17:37:20 +0100
commit8c72ed923d77ee55989965bb02628043799b9548 (patch)
tree802e6eb910719a98fa09bf7c2bd884097f649adc /config-daemon.ac
parent189be331acfda1c242a9c85fca8d2a0356742f48 (diff)
parentaac6cbbfede0bbfafdbbeeb460f00a244333895d (diff)
downloadpatches-8c72ed923d77ee55989965bb02628043799b9548.tar
patches-8c72ed923d77ee55989965bb02628043799b9548.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'config-daemon.ac')
-rw-r--r--config-daemon.ac29
1 files changed, 14 insertions, 15 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index 80d84cbdbc..6cf65bef1d 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -118,30 +118,29 @@ if test "x$guix_build_daemon" = "xyes"; then
dnl Check for <linux/fs.h> (for immutable file support).
AC_CHECK_HEADERS([linux/fs.h])
- dnl Determine the appropriate default list of substitute URLs.
- GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
- if test "x$have_gnutls" = "xyes"; then
- guix_substitute_urls="https://mirror.hydra.gnu.org"
- else
- AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear])
- guix_substitute_urls="http://mirror.hydra.gnu.org"
- fi
+ dnl Determine the appropriate default list of substitute URLs (GnuTLS
+ dnl is required so we can default to 'https'.)
+ case "x$host_cpu" in
+ xaarch64)
+ # Currently only berlin.guixsd.org provides aarch64 binaries.
+ guix_substitute_urls="https://berlin.guixsd.org"
+ ;;
+ *)
+ guix_substitute_urls="https://mirror.hydra.gnu.org"
+ ;;
+ esac
+
AC_MSG_CHECKING([for default substitute URLs])
AC_MSG_RESULT([$guix_substitute_urls])
AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"],
[Default list of substitute URLs used by 'guix-daemon'.])
- dnl Check whether the 'offload' build hook can be built (uses
- dnl 'restore-file-set', which requires unbuffered custom binary input
- dnl ports from Guile >= 2.0.10.)
- GUIX_CHECK_UNBUFFERED_CBIP
-
dnl Check for Guile-SSH, which is required by 'guix offload'.
GUIX_CHECK_GUILE_SSH
- case "x$ac_cv_guix_cbips_support_setvbuf$guix_cv_have_recent_guile_ssh" in
- xyesyes)
+ case "x$guix_cv_have_recent_guile_ssh" in
+ xyes)
guix_build_daemon_offload="yes"
AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1],
[Define if the daemon's 'offload' build hook is being built (requires Guile-SSH).])