* [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style.
@ 2023-03-09 12:30 Nicolas Goaziou
2023-03-09 12:30 ` [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G Nicolas Goaziou
2023-03-10 20:20 ` bug#62075: [PATCH 1/2] gnu: cataclysm-dda: Improve package style Nicolas Goaziou
0 siblings, 2 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-09 12:30 UTC (permalink / raw)
To: 62075
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G.
2023-03-09 12:30 [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style Nicolas Goaziou
@ 2023-03-09 12:30 ` 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
1 sibling, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-09 12:30 UTC (permalink / raw)
To: 62074
* gnu/packages/games.scm (cataclysm-dda): Update to 0.G.
---
gnu/packages/games.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d057823832..a0d7d68c2f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -942,7 +942,7 @@ (define-public bzflag
(define-public cataclysm-dda
(package
(name "cataclysm-dda")
- (version "0.F-3")
+ (version "0.G")
(source
(origin
(method git-fetch)
@@ -950,7 +950,7 @@ (define-public cataclysm-dda
(url "https://github.com/CleverRaven/Cataclysm-DDA")
(commit version)))
(sha256
- (base32 "1qnsz6az9qp4sbr3y4rcqhlmadrrdzafvd2xwf3db5wn0swvbjys"))
+ (base32 "0y8513yflxfqblk42h5ad0dq5lx5s8k6hhjy65yfcda7amsv9mhx"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#62075: [PATCH 1/2] gnu: cataclysm-dda: Improve package style.
2023-03-09 12:30 [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style Nicolas Goaziou
2023-03-09 12:30 ` [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G Nicolas Goaziou
@ 2023-03-10 20:20 ` Nicolas Goaziou
1 sibling, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-10 20:20 UTC (permalink / raw)
To: 62075-done
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> * gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions.
> [native-inputs]: Remove labels. Re-order alphabetically.
Applied. Closing.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#62074: [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G.
2023-03-09 12:30 ` [bug#62074] [PATCH 2/2] gnu: cataclysm-dda: Update to 0.G Nicolas Goaziou
@ 2023-03-10 20:21 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-10 20:21 UTC (permalink / raw)
To: 62074-done
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> * gnu/packages/games.scm (cataclysm-dda): Update to 0.G.
Applied. Closing.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-10 20:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-09 12:30 [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style Nicolas Goaziou
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
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.