From: James Smith via Guix-patches via <guix-patches@gnu.org>
To: 71600@debbugs.gnu.org
Cc: "James Smith" <jsubuntuxp@disroot.org>,
"Adam Faiz" <adam.faiz@disroot.org>,
"Liliana Marie Prikler" <liliana.prikler@gmail.com>,
宋文武 <iyzsong@envs.net>
Subject: [bug#71600] [PATCH 2/2] gnu: quakespasm: Update package style.
Date: Sun, 16 Jun 2024 14:43:13 -0700 [thread overview]
Message-ID: <65f17f61a595030f40a0aaee3db0f7bc3f46b840.1718573761.git.jsubuntuxp@disroot.org> (raw)
In-Reply-To: <cover.1718573761.git.jsubuntuxp@disroot.org>
* gnu/packages/games.scm (quakespasm)[arguments]: Use gexps.
<#:make-flags>: Set compiler to (cc-for-target) instead of hardcoding to gcc.
<#:phases>: Simplify fix-makefile-paths and remove trailing #t.
Change-Id: I250a842c78f2f49b451e5df76509fbe6fa1b4576
---
gnu/packages/games.scm | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8d1450db01..5fe402d2eb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7676,23 +7676,21 @@ (define-public quakespasm
(sha256
(base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw"))))
(arguments
- `(#:tests? #f
- #:make-flags '("CC=gcc"
- "MP3LIB=mpg123"
- "USE_CODEC_FLAC=1"
- "USE_CODEC_MIKMOD=1"
- "USE_SDL2=1"
- "-CQuake")
- #:phases (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'fix-makefile-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (substitute* "Quake/Makefile"
- (("/usr/local/games")
- (string-append out "/bin")))
- #t))))))
+ (list #:tests? #f
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ "MP3LIB=mpg123"
+ "USE_CODEC_FLAC=1"
+ "USE_CODEC_MIKMOD=1"
+ "USE_SDL2=1"
+ "-CQuake")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'fix-makefile-paths
+ (lambda _
+ (mkdir-p (string-append #$output "/bin"))
+ (substitute* "Quake/Makefile"
+ (("/usr/local/games")
+ (string-append #$output "/bin"))))))))
(build-system gnu-build-system)
(inputs (list libmikmod
libvorbis
--
2.45.1
next prev parent reply other threads:[~2024-06-16 21:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-16 21:40 [bug#71600] [PATCH 0/2] Update QuakeSpasm James Smith via Guix-patches via
2024-06-16 21:43 ` [bug#71600] [PATCH 1/2] gnu: quakespasm: Update to 0.96.2 James Smith via Guix-patches via
2024-06-16 21:43 ` James Smith via Guix-patches via [this message]
2024-06-23 13:56 ` bug#71600: [PATCH 0/2] Update QuakeSpasm Liliana Marie Prikler
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=65f17f61a595030f40a0aaee3db0f7bc3f46b840.1718573761.git.jsubuntuxp@disroot.org \
--to=guix-patches@gnu.org \
--cc=71600@debbugs.gnu.org \
--cc=adam.faiz@disroot.org \
--cc=iyzsong@envs.net \
--cc=jsubuntuxp@disroot.org \
--cc=liliana.prikler@gmail.com \
/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).