diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-07 18:27:11 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-07 18:42:46 +0200 |
| commit | ffc72ec6dfb02bca3e282ccc1b6c00da6e7fbcaf (patch) | |
| tree | 57bd7ad9c3c6fffe559da1d316f5180502856571 | |
| parent | 4b74a29d8fd1af870a2db19d554923263abb7657 (diff) | |
| download | guix-ffc72ec6dfb02bca3e282ccc1b6c00da6e7fbcaf.tar guix-ffc72ec6dfb02bca3e282ccc1b6c00da6e7fbcaf.tar.gz | |
gnu: guile-json: Remove hard-coded Guile effective version.
* gnu/packages/guile.scm (guile-json)[snippet]: Modify 'ac_subst_vars'
in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in
'Makefile.in'.
| -rw-r--r-- | gnu/packages/guile.scm | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 195af54c84..bd9902d427 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -514,19 +514,23 @@ for Guile\".") (name "guile-json") (version "0.5.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/guile-json/guile-json-" - version ".tar.gz")) - (sha256 - (base32 - "0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d")) - (modules '((guix build utils))) - (snippet - ;; Make sure everything goes under .../site/2.0, like Guile's - ;; search paths expects. - '(substitute* '("Makefile.in" "json/Makefile.in") - (("moddir =.*/share/guile/site" all) - (string-append all "/2.0")))))) + (method url-fetch) + (uri (string-append "mirror://savannah/guile-json/guile-json-" + version ".tar.gz")) + (sha256 + (base32 + "0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d")) + (modules '((guix build utils))) + (snippet + ;; Make sure everything goes under .../site/X.Y, like Guile's + ;; search paths expects. + '(begin + (substitute* "configure" + (("ac_subst_vars='") + "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) + (substitute* '("Makefile.in" "json/Makefile.in") + (("moddir =.*/share/guile/site" all) + (string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.0))) (home-page "http://savannah.nongnu.org/projects/guile-json/") |