summary refs log tree commit diff
path: root/config-daemon.ac
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2018-03-06 13:39:12 -0500
committerLeo Famulari <leo@famulari.name>2018-03-06 13:39:12 -0500
commit613ef763a52d7825f062eb7b58354504b64d2869 (patch)
treebee086914ed97aab1eaba25c325268e33e57c358 /config-daemon.ac
parent86990eeda2a85acd3640059c0b681f1eddbacba0 (diff)
parent8a325748fb8c3709beb2c26966a3e3c86831f95e (diff)
downloadguix-613ef763a52d7825f062eb7b58354504b64d2869.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'config-daemon.ac')
-rw-r--r--config-daemon.ac20
1 files changed, 12 insertions, 8 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index d409ce0117..6cf65bef1d 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -118,14 +118,18 @@ 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])