nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

channels: Fix external channel builds. 

This fixes a regression introduced in
ca71942445 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'.
master
Ludovic Courtès 2018-09-05 22:42:16 +02:00
parent 00a43cb81c
commit cb341c1219
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/channels.scm
View File

@ -207,13 +207,18 @@ INSTANCES."
(guix-channel? (channel-instance-channel instance))) (guix-channel? (channel-instance-channel instance)))
instances)) 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))) (mlet %store-monad ((core (build-channel-instance core-instance)))
(mapm %store-monad (mapm %store-monad
(lambda (instance) (lambda (instance)
(if (eq? instance core-instance) (if (eq? instance core-instance)
(return core) (return core)
(build-channel-instance instance (build-channel-instance instance
(list core)))) (list core guile-gcrypt))))
instances))) instances)))
(define (whole-package-for-legacy name modules) (define (whole-package-for-legacy name modules)