summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix.scm83
1 files changed, 28 insertions, 55 deletions
diff --git a/guix.scm b/guix.scm
index 18f754b..8af9ae2 100644
--- a/guix.scm
+++ b/guix.scm
@@ -28,15 +28,11 @@
(package
(inherit guile-opengl)
(inputs
- (map (match-lambda
- (("guile" _)
- `("guile" ,target-guile))
- (input input))
- (package-inputs guile-opengl)))
+ (modify-inputs (package-inputs guile-opengl)
+ (replace "guile" target-guile)))
(native-inputs
- (append (package-native-inputs guile-opengl)
- `(("autoconf" ,autoconf)
- ("automake" ,automake))))
+ (modify-inputs (package-native-inputs guile-opengl)
+ (append autoconf automake)))
(arguments
(substitute-keyword-arguments (package-arguments guile-opengl)
((#:phases phases)
@@ -57,7 +53,7 @@
(invoke "autoreconf" "-vfi")))))))))
(define guile-sdl2
- (let ((commit "d31c27ac48f81a534b28531e3d5fa626890be59f"))
+ (let ((commit "e9a7f5e748719ce5b6ccd08ff91861b578034ea6"))
(package
(name "guile-sdl2")
(version (string-append "0.7.0-1." (string-take commit 7)))
@@ -68,7 +64,7 @@
(commit commit)))
(sha256
(base32
- "106pnw4ifgkrgyj84jgpz5gnbgshjcrp10wcyw1skgzqni1mrmg3"))))
+ "0ay7mcar8zs0j5rihwlzi0l46vgg9i93piip4v8a3dzwjx3myr7v"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -77,15 +73,8 @@
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "bootstrap"))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)))
- (inputs
- `(("guile" ,target-guile)
- ("sdl2" ,sdl2)
- ("sdl2-image" ,sdl2-image)))
+ (native-inputs (list autoconf automake pkg-config texinfo))
+ (inputs (list target-guile sdl2))
(synopsis "Guile bindings for SDL2")
(description "Guile-sdl2 provides pure Guile Scheme bindings to the
SDL2 C shared library via the foreign function interface.")
@@ -93,7 +82,7 @@ SDL2 C shared library via the foreign function interface.")
(license license:lgpl3+))))
(define chickadee
- (let ((commit "9028c2caf111aa1030ba402f4116f33d898a6479"))
+ (let ((commit "5ed490cac58d9f548bc141cc334c25dea9bfcaf2"))
(package
(name "chickadee")
(version (string-append "0.8.0-1." (string-take commit 7)))
@@ -104,7 +93,7 @@ SDL2 C shared library via the foreign function interface.")
(commit commit)))
(sha256
(base32
- "0kaw0phwijbyj4gsmsph1z4rl0igqbcibmmm1i17v7pj7v0d7541"))))
+ "1wq1v19qp2q31ybjqzw0xccyw5v03hh9y79z8rjd6l83vbp1nvkx"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -113,21 +102,16 @@ SDL2 C shared library via the foreign function interface.")
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "bootstrap"))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)))
- (inputs
- `(("freetype" ,freetype)
- ("guile" ,target-guile)
- ("libvorbis" ,libvorbis)
- ("mpg123" ,mpg123)
- ("openal" ,openal)
- ("readline" ,readline)))
- (propagated-inputs
- `(("guile-opengl" ,guile3.0-opengl)
- ("guile-sdl2" ,guile-sdl2)))
+ (native-inputs (list autoconf automake pkg-config texinfo))
+ (inputs (list freetype
+ libjpeg-turbo
+ libpng
+ libvorbis
+ mpg123
+ openal
+ readline
+ target-guile))
+ (propagated-inputs (list guile3.0-opengl guile-sdl2))
(synopsis "Game development toolkit for Guile Scheme")
(description "Chickadee is a game development toolkit for Guile
Scheme. It contains all of the basic components needed to develop
@@ -136,7 +120,7 @@ Scheme. It contains all of the basic components needed to develop
(license license:gpl3+))))
(define starling
- (let ((commit "22cda3a7adb2a936210397bfc7b9f3c1ae4ce1ce"))
+ (let ((commit "bd8b5d1f0f7c043c4bef2191a3def7b9fa3efacf"))
(package
(name "starling")
(version (string-append "0.1.0-1." (string-take commit 7)))
@@ -147,7 +131,7 @@ Scheme. It contains all of the basic components needed to develop
(commit commit)))
(sha256
(base32
- "01286cvrz4hq6nxb4id1mmrqnnhg9zp83g7njd6lcan5hn02clff"))))
+ "15hmbb8ksl26hp0cqar08i84hn8x4mrk4agq5v2gd69l23lrkq7k"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -156,15 +140,9 @@ Scheme. It contains all of the basic components needed to develop
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "bootstrap"))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("guile" ,target-guile)))
- (propagated-inputs
- `(("chickadee" ,chickadee)
- ("guile-sdl2" ,guile-sdl2)))
+ (native-inputs (list autoconf automake pkg-config texinfo))
+ (inputs (list target-guile))
+ (propagated-inputs (list chickadee guile-sdl2))
(synopsis "Game engine for Guile Scheme")
(description "Starling is a game engine that I haven't released
yet.")
@@ -211,14 +189,9 @@ yet.")
(getenv "GUILE_LOAD_COMPILED_PATH")
"\"\n"
"exec " guile)))))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("guile" ,target-guile)))
- (propagated-inputs
- `(("starling" ,starling)))
+ (native-inputs (list autoconf automake pkg-config))
+ (inputs (list target-guile))
+ (propagated-inputs (list starling))
(synopsis "Autum Lisp Game Jam 2021 entry")
(description "Dave's Autumn Lisp Game 2021 entry.")
(home-page "https://git.dthompson.us/autumn-lisp-game-jam-2021.git")