guix-commits
[Top][All Lists]
Advanced

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

04/05: gnu: guile-commonmark: Remove hard-coded "/2.0" in installation d


From: Ludovic Courtès
Subject: 04/05: gnu: guile-commonmark: Remove hard-coded "/2.0" in installation directories.
Date: Wed, 7 Sep 2016 16:42:56 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit 757ce0f99d5ffed86ee3258eef6c8841e82e1116
Author: Ludovic Courtès <address@hidden>
Date:   Wed Sep 7 18:33:33 2016 +0200

    gnu: guile-commonmark: Remove hard-coded "/2.0" in installation directories.
    
    * gnu/packages/guile.scm (guile-commonmark)[source]: Add 'snippet' and
    'modules'.
---
 gnu/packages/guile.scm |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index bd9902d..4276e34 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1206,7 +1206,18 @@ you send to a FIFO file.")
                                   "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "12cb5fqvvgc87f5xp0ih5az305wnjia89l5jba83d0r2p8bfy0b0"))))
+                "12cb5fqvvgc87f5xp0ih5az305wnjia89l5jba83d0r2p8bfy0b0"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Use the real effective version of Guile in directory names
+               ;; instead of a hard-coded "/2.0".
+               '(begin
+                  (substitute* "configure"
+                    (("ac_subst_vars='")
+                     "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
+                  (substitute* "Makefile.in"
+                    (("/site/2.0")
+                     "/site/@GUILE_EFFECTIVE_VERSION@"))))))
     (build-system gnu-build-system)
     (inputs
      `(("guile" ,guile-2.0)))



reply via email to

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