diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-02 22:45:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-02 22:52:30 +0200 |
| commit | 1b0f266e40aead09be95a984bd9c6cec3dff397e (patch) | |
| tree | 0076be5d4f4fc82114dc27deb5433f5587126266 /gnu/packages/patches | |
| parent | 61f81618a87ce4fc3b93c3ac3fa7aa2f148c1ed8 (diff) | |
| download | guix-1b0f266e40aead09be95a984bd9c6cec3dff397e.tar.gz guix-1b0f266e40aead09be95a984bd9c6cec3dff397e.zip | |
gnu: Switch guile-cairo and dependents to Guile 2.2 again.
Fixes <https://bugs.gnu.org/27551>.
Reported by Leo Famulari <leo@famulari.name>.
This reinstates the following commits:
e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2.
ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5.
0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd.
66b9183c4 * gnu: guile-lib: Switch to Guile 2.2.
and adds the following changes:
* gnu/bootloader/grub.scm (svg->png): Add 'package->derivation' call for
GUILE-2.2. Pass #:guile-for-build to 'gexp->derivation'.
* gnu/build/svg.scm (svg->png): Add 'em' and 'ex' to the 'let-values'
form to account for all the values returned by
'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/guile-rsvg-pkgconfig.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/patches/guile-rsvg-pkgconfig.patch b/gnu/packages/patches/guile-rsvg-pkgconfig.patch index 2272b4e1cd..51483a3472 100644 --- a/gnu/packages/patches/guile-rsvg-pkgconfig.patch +++ b/gnu/packages/patches/guile-rsvg-pkgconfig.patch @@ -9,7 +9,7 @@ and LDFLAGS for Guile would not be captured. +dnl The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS' +dnl substitution variables, hence this line. -+PKG_CHECK_MODULES(GUILE, guile-2.0) ++PKG_CHECK_MODULES(GUILE, guile-$GUILE_EFFECTIVE_VERSION) + PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0) AC_SUBST(GUILE_CAIRO_LIBS) |