From 1560e460223f89ea61537e13b499d70792d3f3b1 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 30 Sep 2020 23:25:46 -0400
Subject: Add OTF/TTF font support via freetype.

---
 guix.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'guix.scm')

diff --git a/guix.scm b/guix.scm
index 91ea9fb..4861da1 100644
--- a/guix.scm
+++ b/guix.scm
@@ -37,7 +37,7 @@
 (use-modules (ice-9 match)
              (srfi srfi-1)
              (guix packages)
-             (guix licenses)
+             ((guix licenses) #:prefix license:)
              (guix download)
              (guix git-download)
              (guix build-system gnu)
@@ -45,6 +45,7 @@
              (gnu packages)
              (gnu packages audio)
              (gnu packages autotools)
+             (gnu packages fontutils)
              (gnu packages pkg-config)
              (gnu packages texinfo)
              (gnu packages guile)
@@ -90,18 +91,18 @@
                (invoke "autoreconf" "-vfi")))))))))
 
 (define guile-sdl2
-  (let ((commit "dae8466030776f9e3afa851122705baaf09071a9"))
+  (let ((commit "1054cbd906ced5cb38476b00700aa8c279f6e1c8"))
     (package
       (name "guile-sdl2")
       (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
-                  "12rrqdbscrsqpvwwakpv8k88cg53kj9q97diqmfic4hyz5skrgr3"))))
+                  "17cccc2648lhyxq62b1zpzbvmfdqpyn4hnbj2962hbj1mxdms1y8"))))
       (build-system gnu-build-system)
       (arguments
        '(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -123,7 +124,7 @@
       (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+))))
+      (license license:lgpl3+))))
 
 (package
   (name "chickadee")
@@ -136,7 +137,8 @@ SDL2 C shared library via the foreign function interface.")
      ("pkg-config" ,pkg-config)
      ("texinfo" ,texinfo)))
   (inputs
-   `(("guile" ,target-guile)
+   `(("freetype" ,freetype)
+     ("guile" ,target-guile)
      ("libvorbis" ,libvorbis)
      ("mpg123" ,mpg123)
      ("openal" ,openal)))
@@ -148,4 +150,4 @@ SDL2 C shared library via the foreign function interface.")
 Scheme.  It contains all of the basic components needed to develop
 2D/3D video games.")
   (home-page "https://dthompson.us/projects/chickadee.html")
-  (license gpl3+))
+  (license license:gpl3+))
-- 
cgit v1.2.3