diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0942e7cf74..1f07152932 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2808,7 +2808,7 @@ more expressive and flexible than the traditional @code{format} procedure.") `(("autoconf" ,autoconf) ("automake" ,automake) ("bzip2" ,bzip2) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("gettext" ,gettext-minimal) ("libtool" ,libtool) ("perl" ,perl) @@ -2817,7 +2817,7 @@ more expressive and flexible than the traditional @code{format} procedure.") ("texlive" ,(texlive-union (list texlive-generic-epsf))))) (inputs `(("dbus-glib" ,dbus-glib) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("guile-lib" ,guile-lib) ("guile-readline" ,guile-readline) ("freeglut" ,freeglut) @@ -2889,9 +2889,9 @@ in C using Gtk+-3 and WebKitGtk.") "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr")))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2) - ("guile-lib" ,guile2.2-lib) - ("guile-readline" ,guile2.2-readline))) + `(("guile" ,guile-3.0) + ("guile-lib" ,guile-lib) + ("guile-readline" ,guile-readline))) (propagated-inputs '()) (arguments `(#:configure-flags '("--without-examples") @@ -2948,7 +2948,16 @@ perform geometrical transforms on JPEG images.") (file-name (git-file-name name version)) (sha256 (base32 - "1dnkr1hmvfkwgxd75dcf93pg39yfgawvdpzdhv991yhghv0qxc9h")))) + "1dnkr1hmvfkwgxd75dcf93pg39yfgawvdpzdhv991yhghv0qxc9h")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix an inconsistency where 'GUILE_PKG' checks for 3.0 but + ;; later we do 'PKG_CHECK_MODULES([GUILE], guile-2.2)'. + (substitute* "configure.ac" + (("^PKG_CHECK_MODULES\\(\\[GUILE\\].*$") + "")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -2956,12 +2965,12 @@ perform geometrical transforms on JPEG images.") ("bash" ,bash) ("pkg-config" ,pkg-config) ("libtool" ,libtool) - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("glib:bin" ,glib "bin") ("texinfo" ,texinfo) ("perl" ,perl))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-lib" ,guile-lib) ("guile-gcrypt" ,guile-gcrypt) ("guile-readline" ,guile-readline)