guix: Update guile-sdl2 recipe to 0.2.0.

1 files changed, 43 insertions, 51 deletions

diff --git a/guix.scm b/guix.scm
index 5653a36..4cb9319 100644
--- a/guix.scm
+++ b/guix.scm
@@ -38,7 +38,7 @@
              (srfi srfi-1)
              (guix packages)
              (guix licenses)
-             (guix git-download)
+             (guix download)
              (guix build-system gnu)
              (gnu packages)
              (gnu packages autotools)
@@ -64,57 +64,49 @@
   (package-with-guile p guile-next))
 
 (define guile-sdl2
-  (let ((commit "9ec24e3f997e40ebde5e8b0057e0324e21fd93a4"))
-    (package
-      (name "guile-sdl2")
-      (version (string-append "0.1.2-1." (string-take commit 7)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "git://dthompson.us/guile-sdl2.git")
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "1aczhrg5s83242hlj6i258axf8cr8a2pvp1kdfk55cr4gf1ajf5x"))))
-      (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")
-         #: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")))))))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)
-         ("texinfo" ,texinfo)))
-      (inputs
-       `(("guile" ,guile-next)
-         ("sdl2" ,sdl2)
-         ("sdl2-image" ,sdl2-image)
-         ("sdl2-mixer" ,sdl2-mixer)
-         ("sdl2-ttf" ,sdl2-ttf)))
-      (synopsis "Guile bindings for SDL2")
-      (description "Guile-sdl2 provides pure Guile Scheme bindings to the
+  (package
+    (name "guile-sdl2")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://files.dthompson.us/guile-sdl2/"
+                                  "guile-sdl2-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b"))))
+    (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")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-makefile
+           (lambda _
+             ;; Install compiled Guile files in the expected place.
+             (substitute* '("Makefile")
+               (("^godir = .*$")
+                "godir = $(moddir)\n")))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-next)
+       ("sdl2" ,sdl2)
+       ("sdl2-image" ,sdl2-image)
+       ("sdl2-mixer" ,sdl2-mixer)
+       ("sdl2-ttf" ,sdl2-ttf)))
+    (synopsis "Guile bindings for SDL2")
+    (description "Guile-sdl2 provides pure Guile Scheme bindings to the
 SDL2 C shared library via the foreign function interface.")
-      (home-page "https://git.dthompson.us/guile-sdl2.git")
-      (license lgpl3+))))
+    (home-page "https://git.dthompson.us/guile-sdl2.git")
+    (license lgpl3+)))
 
 (package
   (name "chickadee")