diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-10 15:55:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-10 15:56:49 +0100 |
| commit | 1545a012cb7cd78e25ed99ecee26df457be590e9 (patch) | |
| tree | ba78e2fd716b9375fd4cb6ed25d694107f17ec42 | |
| parent | 022c97725862908477c96a08cc72069209f9607a (diff) | |
| download | guix-1545a012cb7cd78e25ed99ecee26df457be590e9.tar guix-1545a012cb7cd78e25ed99ecee26df457be590e9.tar.gz | |
guix archive: Allow compilation in the absence of Guile-JSON.
Fixes <http://bugs.gnu.org/25409>.
Reported by Ben Woodcroft <b.woodcroft@uq.edu.au>.
* guix/scripts/archive.scm: Use 'module-autoload!' instead of #:use-module
to (guix docker).
| -rw-r--r-- | guix/scripts/archive.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 3e056fda9b..9e49c53635 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 <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; 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. |