summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix.scm93
1 files changed, 51 insertions, 42 deletions
diff --git a/guix.scm b/guix.scm
index 79f090a..480b26a 100644
--- a/guix.scm
+++ b/guix.scm
@@ -39,6 +39,7 @@
(guix packages)
(guix licenses)
(guix download)
+ (guix git-download)
(guix build-system gnu)
(gnu packages)
(gnu packages autotools)
@@ -64,49 +65,57 @@
(package-with-guile p guile-2.2))
(define guile-sdl2
- (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
+ (let ((commit "429d7c01b04728fec4bc3896ec70bd970ceecc04"))
+ (package
+ (name "guile-sdl2")
+ (version "0.2.0-1.")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://dthompson.us/guile-sdl2.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "1id3vcdqd15wba1lwyjpbqyyrs7cgkrg348ihl7g73cvkrnycdsd"))))
+ (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-2.2)
+ ("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")