summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2023-06-04 13:00:51 -0400
committerDavid Thompson <dthompson2@worcester.edu>2023-06-04 13:00:51 -0400
commit17b493a5a81bf3480ac121cbe4cb9454919d8768 (patch)
tree874baa2bc352b9f10db21e8bf87085b8a36374a7
parent5ccbb5ef5b40689e58cd713b140eae2f8d125a47 (diff)
Update guix stuff.
-rw-r--r--Makefile.am1
-rw-r--r--guix.scm21
2 files changed, 19 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 9624e82..5b33176 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
$(SOURCES) \
COPYING \
README.md \
+ guix.scm \
assets/audio/absorb.wav \
assets/audio/explosion.wav \
assets/audio/spray.wav \
diff --git a/guix.scm b/guix.scm
index c836b9b..74b32ba 100644
--- a/guix.scm
+++ b/guix.scm
@@ -13,8 +13,23 @@
(gnu packages sdl)
(gnu packages texinfo))
+(define chickadee
+ (let ((commit "ca8b2bd07a07e727b17ebbdf8012c7d9cd135689"))
+ (package
+ (inherit guile-chickadee)
+ (version (string-append "0.9.0-1." (string-take commit 7)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.dthompson.us/chickadee.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "1s6wgb58z09f5li90ds6pnmfismd81xawf0qkxr1jkmvywfdg427"))))
+ (native-inputs (list autoconf automake pkg-config texinfo)))))
+
(define catbird
- (let ((commit "9c71f796b9210e92c3661028f39fbc9ae23abb17"))
+ (let ((commit "fa6a85b92f818f1e0139a33ca4110acc97f8d4f2"))
(package
(name "catbird")
(version (string-append "0.1.0-1." (string-take commit 7)))
@@ -25,13 +40,13 @@
(commit commit)))
(sha256
(base32
- "0bny6rc01q0a7rx59cyz2893xgfgqqv8frqicly5xshm6pfwz32z"))))
+ "0jhsf1idrq433x4l10yfzkmd68k5y1ypsfzqpmh1rv6clczxyszf"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list guile-3.0))
- (propagated-inputs (list guile-chickadee guile-sdl2))
+ (propagated-inputs (list chickadee guile-sdl2))
(synopsis "Game engine for Scheme programmers")
(description "Catbird is a game engine written in Guile Scheme.")
(home-page "https://dthompson.us/projects/chickadee.html")