diff options
| author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
|---|---|---|
| committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
| commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
| tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /gnu/packages/guile.scm | |
| parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
| parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
| download | gnu-guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar gnu-guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz | |
Merge 'master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c3045720c5..55aeff172d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1346,7 +1346,24 @@ users and in some situations.") version ".tar.gz")) (sha256 (base32 - "1svzlbz2vripmyq2kjh0rig16bsrnbkwbsm558pjln9l65mcl4qq")))) + "1svzlbz2vripmyq2kjh0rig16bsrnbkwbsm558pjln9l65mcl4qq")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "configure" + (("_guile_required_version=\"2.0.11\"") + "_guile_required_version=\"2\"") + (("ac_subst_vars='") + "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) + (substitute* (find-files "." "Makefile.in") + (("moddir = .*$") + (string-append + "moddir = " + "$(prefix)/share/guile/site/@GUILE_EFFECTIVE_VERSION@\n")) + (("godir = .*$") + (string-append + "godir = " + "$(prefix)/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))))))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -1357,7 +1374,7 @@ users and in some situations.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("guile-sdl" ,guile-sdl) ("guile-opengl" ,guile-opengl))) (inputs |