diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-23 20:48:55 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-23 20:48:55 +0200 |
| commit | 4c1918db34e09f0da793c607acc161bdf9ec5535 (patch) | |
| tree | e84431dc161ed3c04c9b94abe8224ec7f759df5f /guix/build | |
| parent | e8062974d5cc598134da4d57ff45970ac431611b (diff) | |
| parent | 4163b6d855a4e655852029625762fccb077a196d (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/download.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm index 0c9c61de4b..a4c91550a6 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -172,7 +172,8 @@ session record port using PORT as its underlying communication port." (define %x509-certificate-directory ;; The directory where X.509 authority PEM certificates are stored. (make-parameter (or (getenv "GUIX_TLS_CERTIFICATE_DIRECTORY") - (getenv "SSL_CERT_DIR")))) ;like OpenSSL + (getenv "SSL_CERT_DIR") ;like OpenSSL + "/etc/ssl/certs"))) (define (set-certificate-credentials-x509-trust-file!* cred file format) "Like 'set-certificate-credentials-x509-trust-file!', but without the file |