From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: 62075@debbugs.gnu.org
Subject: [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style.
Date: Thu, 9 Mar 2023 13:30:46 +0100 [thread overview]
Message-ID: <20230309123047.70497-1-mail@nicolasgoaziou.fr> (raw)
* gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions.
[native-inputs]: Remove labels. Re-order alphabetically.
---
gnu/packages/games.scm | 65 ++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2946c787af..d057823832 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -954,43 +954,40 @@ (define-public cataclysm-dda
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags
- (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
- "LOCALIZE=1" "LANGUAGES=all")
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- ;; Apparently we can't do make on both tiles and a console version at
- ;; the same time anymore, so we have to either "make clean" between
- ;; builds or do some other hackery. See:
- ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746
- (add-after 'install 'make-clean-pre-tiles
- (lambda* (#:key make-flags outputs #:allow-other-keys)
- ;; Change prefix directory and enable tile graphics and sound.
- (invoke "make" "clean")))
- (add-after 'make-clean-pre-tiles 'build-tiles
- (lambda* (#:key make-flags outputs #:allow-other-keys)
- ;; Change prefix directory and enable tile graphics and sound.
- (apply invoke "make" "TILES=1" "SOUND=1"
- (string-append "PREFIX="
- (assoc-ref outputs "tiles"))
- (cdr make-flags))))
- (add-after 'build-tiles 'install-tiles
- (lambda* (#:key make-flags outputs #:allow-other-keys)
- (apply invoke "make" "install" "TILES=1" "SOUND=1"
- (string-append "PREFIX="
- (assoc-ref outputs "tiles"))
- (cdr make-flags)))))
- ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native
- ;; input in order to support tests.
- #:tests? #f))
+ (list
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
+ "LOCALIZE=1" "LANGUAGES=all")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ ;; Apparently we can't do make on both tiles and a console version at
+ ;; the same time anymore, so we have to either "make clean" between
+ ;; builds or do some other hackery. See:
+ ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746
+ (add-after 'install 'make-clean-pre-tiles
+ (lambda* (#:key make-flags outputs #:allow-other-keys)
+ ;; Change prefix directory and enable tile graphics and sound.
+ (invoke "make" "clean")))
+ (add-after 'make-clean-pre-tiles 'build-tiles
+ (lambda* (#:key make-flags outputs #:allow-other-keys)
+ ;; Change prefix directory and enable tile graphics and sound.
+ (apply invoke "make" "TILES=1" "SOUND=1"
+ (string-append "PREFIX=" #$output:tiles)
+ (cdr make-flags))))
+ (add-after 'build-tiles 'install-tiles
+ (lambda* (#:key make-flags outputs #:allow-other-keys)
+ (apply invoke "make" "install" "TILES=1" "SOUND=1"
+ (string-append "PREFIX=" #$output:tiles)
+ (cdr make-flags)))))
+ ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native
+ ;; input in order to support tests.
+ #:tests? #f))
(outputs '("out"
"tiles")) ;for tile graphics and sound support
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("astyle" ,astyle)))
+ (list astyle gettext-minimal pkg-config))
(inputs
(list freetype
libogg
base-commit: 5befcff66edb4d72ab8e713c81836fb8519ce3e6
--
2.39.2
next reply other threads:[~2023-03-09 12:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-09 12:30 Nicolas Goaziou [this message]
2023-03-09 12:30 ` [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G Nicolas Goaziou
2023-03-10 20:21 ` bug#62074: " Nicolas Goaziou
2023-03-10 20:20 ` bug#62075: [PATCH 1/2] gnu: cataclysm-dda: Improve package style Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230309123047.70497-1-mail@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=62075@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).