nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* gnu/packages/guile.scm (guile-redis)[snippet]: Modify 'ac_subst_vars'
in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in
'Makefile.in'.
This commit is contained in:
Ricardo Wurmus 2016-09-13 15:05:07 +02:00
parent dbc6d370fa
commit ea833d301b
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/guile.scm
View File

@ -935,13 +935,17 @@ above command-line parameters.")
"0vx6if6b4r3kwx64vzbs6vpc0cpcr85x11w9vkzq27gw8n7isv56")) "0vx6if6b4r3kwx64vzbs6vpc0cpcr85x11w9vkzq27gw8n7isv56"))
(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" '(begin
"redis/Makefile.in" (substitute* "configure"
"redis/commands/Makefile.in") (("ac_subst_vars='")
(("moddir =.*/share/guile/site" all) "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
(string-append all "/2.0")))))) (substitute* '("Makefile.in"
"redis/Makefile.in"
"redis/commands/Makefile.in")
(("moddir =.*/share/guile/site" all)
(string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("guile" ,guile-2.0))) `(("guile" ,guile-2.0)))