aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-05 22:42:16 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-05 23:33:49 +0200
commitcb341c121919877ae6267a6460c0c17536d06eff (patch)
tree998fff53fb9112010b177ed1a84a138ca3011ea9
parent00a43cb81cecb30d40f9940407c9f1ba08d3d38e (diff)
downloadguix-cb341c121919877ae6267a6460c0c17536d06eff.tar
guix-cb341c121919877ae6267a6460c0c17536d06eff.tar.gz
channels: Fix external channel builds.
This fixes a regression introduced in ca719424455465fca4b872c371daf2a46de88b33 whereby external channels would fail to build due to the lack of (gcrypt …) modules. * guix/channels.scm (channel-instance-derivations): Add 'guile-gcrypt'. Pass it along CORE to 'build-channel-instance'.
-rw-r--r--guix/channels.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/channels.scm b/guix/channels.scm
index 794383fe22..ebae7489f4 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -207,13 +207,18 @@ INSTANCES."
(guix-channel? (channel-instance-channel instance)))
instances))
+ ;; Guile-Gcrypt is a dependency of CORE-INSTANCE.
+ (define guile-gcrypt
+ (module-ref (resolve-interface '(gnu packages gnupg))
+ 'guile-gcrypt))
+
(mlet %store-monad ((core (build-channel-instance core-instance)))
(mapm %store-monad
(lambda (instance)
(if (eq? instance core-instance)
(return core)
(build-channel-instance instance
- (list core))))
+ (list core guile-gcrypt))))
instances)))
(define (whole-package-for-legacy name modules)