nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-10-14 15:21:22 +02:00
parent 31c70cce50
commit 4fa3f7967f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/sdl.scm
View File

@ -409,7 +409,12 @@ directory.")
'(#:configure-flags '(#:configure-flags
(list (string-append "--with-sdl-prefix=" (list (string-append "--with-sdl-prefix="
(assoc-ref %build-inputs "sdl-union"))) (assoc-ref %build-inputs "sdl-union")))
#:modules ((ice-9 popen)
(guix build utils)
(guix build gnu-build-system))
#:parallel-build? #f ; parallel build fails #:parallel-build? #f ; parallel build fails
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-env-and-patch (add-before 'configure 'fix-env-and-patch
@ -418,9 +423,16 @@ directory.")
;; SDL_image needs to dlopen libjpeg in the test suite. ;; SDL_image needs to dlopen libjpeg in the test suite.
(setenv "LD_LIBRARY_PATH" (setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref inputs "libjpeg") "/lib")) (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" (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 ;; Skip tests that rely on sound support, which is unavailable in
;; the build environment. ;; the build environment.