gnu: crawl: Use G-epressions.
* gnu/packages/games.scm (crawl)[arguments]: Use G-expressions. <#:phases>: Remove trailing #T. Remove unnecessary arguments. (crawl-tiles)[arguments]: Use G-expressions.master
parent
32be3791a2
commit
19753d9f65
|
@ -6411,14 +6411,15 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
|||
python-wrapper
|
||||
python-pyyaml))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let* ((sqlite (assoc-ref %build-inputs "sqlite"))
|
||||
(out (assoc-ref %outputs "out")))
|
||||
(list (string-append "SQLITE_INCLUDE_DIR=" sqlite "/include")
|
||||
(string-append "prefix=" out)
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "SQLITE_INCLUDE_DIR="
|
||||
#$(this-package-input "sqlite")
|
||||
"/include")
|
||||
(string-append "prefix=" #$output)
|
||||
"SAVEDIR=~/.crawl"
|
||||
;; Don't compile with SSE on systems which don't have it.
|
||||
,@(match (%current-system)
|
||||
#$@(match (%current-system)
|
||||
((or "i686-linux" "x86_64-linux")
|
||||
'())
|
||||
(_ '("NOSSE=TRUE")))
|
||||
|
@ -6426,17 +6427,16 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
|||
"BUILD_LUA="
|
||||
"BUILD_SQLITE="
|
||||
"BUILD_ZLIB="
|
||||
"-Csource"))
|
||||
"-Csource")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'find-SDL-image
|
||||
(lambda _
|
||||
(substitute* "source/windowmanager-sdl.cc"
|
||||
(("SDL_image.h") "SDL2/SDL_image.h"))
|
||||
#t))
|
||||
(("SDL_image.h") "SDL2/SDL_image.h"))))
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda* (#:key inputs outputs make-flags #:allow-other-keys)
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Fake a terminal for the test cases.
|
||||
(setenv "TERM" "xterm-256color")
|
||||
|
@ -6469,16 +6469,17 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
|
|||
(substitute-keyword-arguments
|
||||
(package-arguments crawl)
|
||||
((#:make-flags flags)
|
||||
`(let ((dejavu (assoc-ref %build-inputs "font-dejavu")))
|
||||
(cons*
|
||||
(string-append "PROPORTIONAL_FONT=" dejavu
|
||||
#~(cons*
|
||||
(string-append "PROPORTIONAL_FONT="
|
||||
#$(this-package-input "font-dejavu")
|
||||
"/share/fonts/truetype/DejaVuSans.ttf")
|
||||
(string-append "MONOSPACED_FONT=" dejavu
|
||||
(string-append "MONOSPACED_FONT="
|
||||
#$(this-package-input "font-dejavu")
|
||||
"/share/fonts/truetype/DejaVuSansMono.ttf")
|
||||
"TILES=y"
|
||||
;; Rename the executable to allow parallel installation with crawl.
|
||||
"GAME=crawl-tiles"
|
||||
,flags)))))
|
||||
#$flags))))
|
||||
(inputs
|
||||
`(,@(package-inputs crawl)
|
||||
("font-dejavu" ,font-dejavu)
|
||||
|
|
Reference in New Issue