01/02: channels: Fix external channel builds.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit cb341c121919877ae6267a6460c0c17536d06eff
Author: Ludovic Courtès <address@hidden>
Date:   Wed Sep 5 22:42:16 2018 +0200

    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'.
---
 guix/channels.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 794383f..ebae748 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)