Update guix.scm.

1 files changed, 26 insertions, 33 deletions

diff --git a/guix.scm b/guix.scm
index c1048a7..d626105 100644
--- a/guix.scm
+++ b/guix.scm
@@ -42,22 +42,27 @@
              (guix packages)
              (guix utils)
              (gnu packages)
+             (gnu packages audio)
              (gnu packages autotools)
              (gnu packages pkg-config)
              (gnu packages texinfo)
              (gnu packages guile)
              (gnu packages gl)
              (gnu packages sdl)
+             (gnu packages mp3)
              (gnu packages maths)
-             (gnu packages image))
+             (gnu packages image)
+             (gnu packages xiph))
 
-(define guile-opengl
+(define target-guile guile-3.0)
+
+(define guile3.0-opengl
   (package
     (inherit guile-opengl)
     (inputs
      (map (match-lambda
             (("guile" _)
-             `("guile" ,guile-next))
+             `("guile" ,target-guile))
             (input input))
           (package-inputs guile-opengl)))
     (native-inputs
@@ -84,48 +89,33 @@
                (invoke "autoreconf" "-vfi")))))))))
 
 (define guile-sdl2
-  (let ((commit "1c6a6250d2c1e6bfaca15058225f66ce9187ecaf"))
+  (let ((commit "1b7cdecf240859baa497f10215f3ebf72ec46963"))
     (package
       (name "guile-sdl2")
-      (version (string-append "0.3.1-1." (string-take commit 7)))
+      (version (string-append "0.5.0-1." (string-take commit 7)))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "git://dthompson.us/guile-sdl2.git")
+                      (url "https://git.dthompson.us/guile-sdl2.git")
                       (commit commit)))
                 (sha256
                  (base32
-                  "00lx6hw6jip0xdn7iapccswdh8wb2d69rikapj4laqlrybhjhp29"))))
+                  "1rpxbpfxz3lan70lcfmi1kbapsjnj52s6vy6p0bqj7way6535sq6"))))
       (build-system gnu-build-system)
       (arguments
-       '(#:configure-flags
-         (list (string-append "--with-libsdl2-prefix="
-                              (assoc-ref %build-inputs "sdl2"))
-               (string-append "--with-libsdl2-image-prefix="
-                              (assoc-ref %build-inputs "sdl2-image"))
-               (string-append "--with-libsdl2-ttf-prefix="
-                              (assoc-ref %build-inputs "sdl2-ttf"))
-               (string-append "--with-libsdl2-mixer-prefix="
-                              (assoc-ref %build-inputs "sdl2-mixer")))
-         #:make-flags '("GUILE_AUTO_COMPILE=0")
+       '(#:make-flags '("GUILE_AUTO_COMPILE=0")
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'bootstrap
                       (lambda _
-                        (zero? (system* "sh" "bootstrap"))))
-           (add-after 'configure 'patch-makefile
-                      (lambda _
-                        ;; Install compiled Guile files in the expected place.
-                        (substitute* '("Makefile")
-                          (("^godir = .*$")
-                           "godir = $(moddir)\n")))))))
+                        (invoke "sh" "bootstrap"))))))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("texinfo" ,texinfo)))
       (inputs
-       `(("guile" ,guile-next)
+       `(("guile" ,target-guile)
          ("sdl2" ,sdl2)
          ("sdl2-image" ,sdl2-image)
          ("sdl2-mixer" ,sdl2-mixer)
@@ -137,18 +127,18 @@ SDL2 C shared library via the foreign function interface.")
       (license lgpl3+))))
 
 (define chickadee
-  (let ((commit "ecc4cc242580610f21f5a4d44a3bf44a09dca81e"))
+  (let ((commit "c2f39ea3e873ad9663c28c4c870ba47cda32497e"))
     (package
      (name "chickadee")
-     (version "0.4.0")
+     (version (string-append "0.5.0-1." (string-take commit 7)))
      (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "git://dthompson.us/chickadee.git")
+                    (url "https://git.dthompson.us/chickadee.git")
                     (commit commit)))
               (sha256
                (base32
-                "03z07iqj4fvbf1fmxpfnxahxyn2jq2grxajnfnjjhl0ya8h6jdc7"))))
+                "0ibii5g0b6ax2ijmv7n44ly8fbi8jrycjkzmvhqfbym250g4rrfp"))))
      (build-system gnu-build-system)
      (arguments
       '(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -156,16 +146,19 @@ SDL2 C shared library via the foreign function interface.")
         (modify-phases %standard-phases
                        (add-after 'unpack 'bootstrap
                                   (lambda _
-                                    (zero? (system* "sh" "bootstrap")))))))
+                                    (invoke "sh" "bootstrap"))))))
      (native-inputs
       `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("pkg-config" ,pkg-config)
         ("texinfo" ,texinfo)))
      (inputs
-      `(("guile" ,guile-next)))
+      `(("guile" ,target-guile)
+        ("libvorbis" ,libvorbis)
+        ("mpg123" ,mpg123)
+        ("openal" ,openal)))
      (propagated-inputs
-      `(("guile-opengl" ,guile-opengl)
+      `(("guile-opengl" ,guile3.0-opengl)
         ("guile-sdl2" ,guile-sdl2)))
      (synopsis "Game development toolkit for Guile Scheme")
      (description "Chickadee is a game development toolkit for Guile
@@ -185,7 +178,7 @@ Scheme.  It contains all of the basic components needed to develop
      ("pkg-config" ,pkg-config)
      ("texinfo" ,texinfo)))
   (inputs
-   `(("guile" ,guile-next)))
+   `(("guile" ,target-guile)))
   (propagated-inputs
    `(("guile-sdl2" ,guile-sdl2)
      ("chickadee" ,chickadee)))