summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix.scm64
1 files changed, 21 insertions, 43 deletions
diff --git a/guix.scm b/guix.scm
index 9560037..3323827 100644
--- a/guix.scm
+++ b/guix.scm
@@ -59,33 +59,21 @@
(define target-guile guile-3.0-latest)
-(define guile3.0-opengl
- (package
- (inherit guile-opengl)
- (inputs
- (modify-inputs (package-inputs guile-opengl)
- (replace "guile" target-guile)))
- (native-inputs
- (modify-inputs (package-native-inputs guile-opengl)
- (append autoconf automake)))
- (arguments
- (substitute-keyword-arguments (package-arguments guile-opengl)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'patch-makefile)
- (add-before 'bootstrap 'patch-configure.ac
- (lambda _
- ;; The Guile version check doesn't work for the 3.0
- ;; pre-release, so just remove it.
- (substitute* "configure.ac"
- (("GUILE_PKG\\(\\[2.2 2.0\\]\\)") ""))
- (substitute* "Makefile.am"
- (("\\$\\(GUILE_EFFECTIVE_VERSION\\)") "3.0")
- (("ccache") "site-ccache"))
- #t))
- (replace 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi")))))))))
+(define guile-opengl*
+ (let ((commit "bd1ac49b43430d85a75130ea962210e687599a89"))
+ (package
+ (inherit guile-opengl)
+ (version (string-append "0.2.0-1." (string-take commit 7)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/guile-opengl.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "1iq21x8hxdq4gsbykiy1q9xy43psv7jjripw4raxdy93fvdasj50"))))
+ (native-inputs (list autoconf automake pkg-config texinfo))
+ (inputs (list freeglut glu mesa target-guile)))))
(define guile-sdl2
(let ((commit "e9a7f5e748719ce5b6ccd08ff91861b578034ea6"))
@@ -102,12 +90,7 @@
"0ay7mcar8zs0j5rihwlzi0l46vgg9i93piip4v8a3dzwjx3myr7v"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags '("GUILE_AUTO_COMPILE=0")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (invoke "sh" "bootstrap"))))))
+ '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list target-guile sdl2))
(synopsis "Guile bindings for SDL2")
@@ -117,10 +100,10 @@ SDL2 C shared library via the foreign function interface.")
(license license:lgpl3+))))
(define chickadee
- (let ((commit "d0db8e04dd5cd4466d534d4e2f71439e27b73bee"))
+ (let ((commit "8edba4d957f49d816ea9e773c69d4a6ece7f07d1"))
(package
(name "chickadee")
- (version (string-append "0.8.0-1." (string-take commit 7)))
+ (version (string-append "0.9.0-1." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -128,15 +111,10 @@ SDL2 C shared library via the foreign function interface.")
(commit commit)))
(sha256
(base32
- "17nx9ywsag830xm3cmkfkc6l8qznjkabzq9vm4mh841913dj3akl"))))
+ "0x0fxwyhp1h2p97faq9gh27iq6r7yvz05wsmhi1jn8mkmxy7ydv9"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags '("GUILE_AUTO_COMPILE=0")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (invoke "sh" "bootstrap"))))))
+ '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list freetype
libjpeg-turbo
@@ -146,7 +124,7 @@ SDL2 C shared library via the foreign function interface.")
openal
readline
target-guile))
- (propagated-inputs (list guile3.0-opengl guile-sdl2))
+ (propagated-inputs (list guile-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