aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/sdl.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-10-14 15:21:22 +0200
committerLudovic Courtès <ludo@gnu.org>2017-10-14 17:07:35 +0200
commit4fa3f7967fb3ea271b52a2fd78c0bcc3feef795e (patch)
treedfd5f1f326c368fc568bd807198f64bff65be3ae /gnu/packages/sdl.scm
parent31c70cce500dcac6818fc9f1b7ccd969c347c74f (diff)
downloadguix-4fa3f7967fb3ea271b52a2fd78c0bcc3feef795e.tar
guix-4fa3f7967fb3ea271b52a2fd78c0bcc3feef795e.tar.gz
gnu: guile-sdl: Remove 2.0-specific bits.
* gnu/packages/sdl.scm (guile-sdl)[arguments]: Add #:modules. In 'fix-env-and-patch' phase, use 'open-pipe*' to determine the effective version; use it in makefiles.
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r--gnu/packages/sdl.scm16
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 0962ffe985..bdf36f3b02 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -409,7 +409,12 @@ directory.")
'(#:configure-flags
(list (string-append "--with-sdl-prefix="
(assoc-ref %build-inputs "sdl-union")))
+ #:modules ((ice-9 popen)
+ (guix build utils)
+ (guix build gnu-build-system))
+
#:parallel-build? #f ; parallel build fails
+
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-env-and-patch
@@ -418,9 +423,16 @@ directory.")
;; SDL_image needs to dlopen libjpeg in the test suite.
(setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref inputs "libjpeg") "/lib"))
- ;; Change the site directory /site/2.0 like Guile expects.
+
+ ;; Change the site directory /site/X.Y like Guile expects.
(substitute* "build-aux/guile-baux/re-prefixed-site-dirs"
- (("\"/site\"") "\"/site/2.0\""))
+ (("\"/site\"")
+ (let ((effective
+ (read
+ (open-pipe* OPEN_READ
+ "guile" "-c"
+ "(write (effective-version))"))))
+ (string-append "\"/site/" effective "\""))))
;; Skip tests that rely on sound support, which is unavailable in
;; the build environment.