diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-04-07 20:49:13 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-04-11 21:29:29 +0200 |
| commit | 541122957c68a15f8657775e62448b1cfafd7cb8 (patch) | |
| tree | 6f29661401a440ab3500cc853f008a6aca483fa3 /gnu/packages/guile.scm | |
| parent | 6a39cbe72287a00d85b71ff86197c9b3c6c2fd9d (diff) | |
| download | guix-541122957c68a15f8657775e62448b1cfafd7cb8.tar.gz | |
gnu: guile-json: Cross-build fix.
* gnu/packages/patches/guile-json-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-json-3)[source]: Use it. [arguments]: Remove configure to trigger bootstrap phase.
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d69dee51c9..8ccbc22f26 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -526,12 +526,21 @@ specification. These are the main features: (method url-fetch) (uri (string-append "mirror://savannah/guile-json/guile-json-" version ".tar.gz")) + (patches (search-patches "guile-json-cross.patch")) (sha256 (base32 "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz")))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) ("guile" ,guile-3.0))) - (inputs `(("guile" ,guile-3.0))))) + (inputs `(("guile" ,guile-3.0))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-configure + (lambda _ + (delete-file "configure") + #t))))))) (define-public guile2.2-json (package-for-guile-2.2 guile-json-3)) |