guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/06: gnu: guile2.0-git: Fix compilation of libgit2.


From: guix-commits
Subject: 01/06: gnu: guile2.0-git: Fix compilation of libgit2.
Date: Sat, 23 Nov 2019 16:48:25 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 60353203ed9322326590cec30ff8ca870f694288
Author: Ludovic Courtès <address@hidden>
Date:   Sat Nov 23 16:10:03 2019 +0100

    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.
---
 gnu/packages/guile.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 57e9a0a..c7a79f2 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
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]