me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guile-json: Remove hard-coded Guile effective version.

Browse source 
* 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'.
This commit is contained in:
Ludovic Courtès 2016-09-07 18:27:11 +02:00
parent 4b74a29d8f
commit ffc72ec6df
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/guile.scm
View file

@ -522,11 +522,15 @@ for Guile\".")
"0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d")) "0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure everything goes under .../site/2.0, like Guile's ;; Make sure everything goes under .../site/X.Y, like Guile's
;; search paths expects. ;; search paths expects.
'(substitute* '("Makefile.in" "json/Makefile.in") '(begin
(substitute* "configure"
(("ac_subst_vars='")
"ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
(substitute* '("Makefile.in" "json/Makefile.in")
(("moddir =.*/share/guile/site" all) (("moddir =.*/share/guile/site" all)
(string-append all "/2.0")))))) (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("guile" ,guile-2.0))) (native-inputs `(("guile" ,guile-2.0)))
(home-page "http://savannah.nongnu.org/projects/guile-json/") (home-page "http://savannah.nongnu.org/projects/guile-json/")