mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
pack: Use 'guile2.0-json' when building with Guile 2.0.
Fixes <http://bugs.gnu.org/27005>.
Reported by Pjotr Prins <pjotr.public12@thebird.nl>.
Fixes a regression introduced in commit
2252f087d4
.
* guix/scripts/pack.scm (docker-image)[json]: New variable.
[build]: Use it.
This commit is contained in:
parent
7dccad95b6
commit
96afb480f8
1 changed files with 9 additions and 2 deletions
|
@ -35,7 +35,7 @@ (define-module (guix scripts pack)
|
|||
#:autoload (gnu packages base) (tar)
|
||||
#:autoload (gnu packages package-management) (guix)
|
||||
#:autoload (gnu packages gnupg) (libgcrypt)
|
||||
#:autoload (gnu packages guile) (guile-json)
|
||||
#:autoload (gnu packages guile) (guile2.0-json guile-json)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-37)
|
||||
|
@ -217,6 +217,13 @@ (define-module (guix config)
|
|||
(define %libgcrypt
|
||||
#+(file-append libgcrypt "/lib/libgcrypt"))))))
|
||||
|
||||
(define json
|
||||
;; Pick the guile-json package that corresponds to the Guile used to build
|
||||
;; derivations.
|
||||
(if (string-prefix? "2.0" (package-version (default-guile)))
|
||||
guile2.0-json
|
||||
guile-json))
|
||||
|
||||
(define build
|
||||
(with-imported-modules `(,@(source-module-closure '((guix docker))
|
||||
#:select? not-config?)
|
||||
|
@ -224,7 +231,7 @@ (define build
|
|||
#~(begin
|
||||
;; Guile-JSON is required by (guix docker).
|
||||
(add-to-load-path
|
||||
(string-append #$guile-json "/share/guile/site/"
|
||||
(string-append #+json "/share/guile/site/"
|
||||
(effective-version)))
|
||||
|
||||
(use-modules (guix docker) (srfi srfi-19))
|
||||
|
|
Loading…
Reference in a new issue