diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-11-23 16:10:03 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-23 22:45:21 +0100 |
commit | 60353203ed9322326590cec30ff8ca870f694288 (patch) | |
tree | 9ff5ce20150297d8b03c9aa87f51e47f7581ee11 | |
parent | a3e5361b64acc4223c01d829cf99389b3e7b1dad (diff) | |
download | guix-60353203ed9322326590cec30ff8ca870f694288.tar guix-60353203ed9322326590cec30ff8ca870f694288.tar.gz |
gnu: guile2.0-git: Fix compilation of libgit2.
* gnu/packages/guile.scm (guile2.0-git): Inherit from what
'package-for-guile-2.0' returns. Add 'inputs' field.
-rw-r--r-- | gnu/packages/guile.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 57e9a0aca5..c7a79f2b8a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -623,7 +623,15 @@ manipulate repositories of the Git version control system.") (license license:gpl3+))) (define-public guile2.0-git - (package-for-guile-2.0 guile-git)) + (let ((base (package-for-guile-2.0 guile-git))) + (package + (inherit base) + ;; Libgit2's Guile test driver requires (ice-9 textual-ports), which is + ;; not in Guile 2.0. Thus, keep LIBGIT2 as-is here (i.e., built against + ;; Guile 2.2). + (inputs `(("libgit2" ,libgit2) + ,@(srfi-1:alist-delete "libgit2" + (package-inputs base))))))) ;;; guile.scm ends here |