03/03: guix archive: Allow compilation in the absence of Guile-JSON.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1545a012cb7cd78e25ed99ecee26df457be590e9
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jan 10 15:55:57 2017 +0100

    guix archive: Allow compilation in the absence of Guile-JSON.
    
    Fixes <http://bugs.gnu.org/25409>.
    Reported by Ben Woodcroft <address@hidden>.
    
    * guix/scripts/archive.scm: Use 'module-autoload!' instead of #:use-module
    to (guix docker).
---
 guix/scripts/archive.scm |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 3e056fd..9e49c53 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -31,7 +31,6 @@
   #:use-module (guix ui)
   #:use-module (guix pki)
   #:use-module (guix pk-crypto)
-  #:use-module (guix docker)
   #:use-module (guix scripts)
   #:use-module (guix scripts build)
   #:use-module (gnu packages)
@@ -46,6 +45,11 @@
   #:export (guix-archive
             options->derivations+files))
 
+;; XXX: Use this hack instead of #:autoload to avoid compilation errors.
+;; See <http://bugs.gnu.org/12202>.
+(module-autoload! (current-module)
+                  '(guix docker) '(build-docker-image))
+
 
 ;;;
 ;;; Command-line options.