Skip to content
Snippets Groups Projects
Unverified Commit 058d0251 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

download, git: Refer to the right module in 'module-use!' call.

This fixes a regression introduced in
6a7c4636.

* guix/build/download.scm (load-gnutls): Call 'resolve-module' instead
of 'current-module'.
* guix/git.scm (load-git-submodules): Likewise.
parent 7a0836cf
No related branches found
No related tags found
No related merge requests found
...@@ -158,7 +158,8 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?) ...@@ -158,7 +158,8 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?)
(define (load-gnutls) (define (load-gnutls)
;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; XXX: Use this hack instead of #:autoload to avoid compilation errors.
;; See <http://bugs.gnu.org/12202>. ;; See <http://bugs.gnu.org/12202>.
(module-use! (current-module) (resolve-interface '(gnutls))) (module-use! (resolve-module '(guix build download))
(resolve-interface '(gnutls)))
(set! load-gnutls (const #t))) (set! load-gnutls (const #t)))
(define %x509-certificate-directory (define %x509-certificate-directory
......
...@@ -203,7 +203,7 @@ (define (load-git-submodules) ...@@ -203,7 +203,7 @@ (define (load-git-submodules)
(set! load-git-submodules (const #f)) (set! load-git-submodules (const #f))
#f) #f)
(iface (iface
(module-use! (current-module) iface) (module-use! (resolve-module '(guix git)) iface)
(set! load-git-submodules (const #t)) (set! load-git-submodules (const #t))
#t))) #t)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment