all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: iyzsong--- via Guix-patches via <guix-patches@gnu.org>
To: 63682@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>,
	"Liliana Marie Prikler" <liliana.prikler@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions.
Date: Wed, 24 May 2023 21:38:35 +0800	[thread overview]
Message-ID: <e48b0e1d10192d62c83211815574969fd0a63079.1684934823.git.iyzsong@member.fsf.org> (raw)
In-Reply-To: <f06548822c4949110573998bf2aef150889126e1.1684934823.git.iyzsong@member.fsf.org>

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/games.scm (warzone2100)[arguments]: Convert to list of
G-expressions.
---
 gnu/packages/games.scm | 47 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index eb3e0eb842..86382f7080 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5414,30 +5414,29 @@ (define-public warzone2100
              #t))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DWZ_DISTRIBUTOR=Guix"
-                           "-DWZ_ENABLE_BACKEND_VULKAN=off"
-                           "-DENABLE_DISCORD=off")
-       #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-utfcpp-include
-           (lambda _
-             (substitute* "lib/framework/wzstring.cpp"
-               (("<utfcpp/source/utf8.h>") "<utf8.h>"))
-             #t))
-         (add-after 'unpack 'link-tests-with-qt
-           (lambda _
-             (substitute* "tests/Makefile.am"
-               (("(framework_linktest_LDADD|maptest_LDADD) = " prefix)
-                (string-append prefix "$(QT5_LIBS) ")))
-             #t))
-         (add-after 'unpack 'fix-ivis-linktest
-           (lambda _
-             (substitute* "tests/ivis_linktest.cpp"
-               (("iV_DrawTextRotated.*;")
-                (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", "
-                               "100, 100, 0.0f, font_regular);")))
-             #t)))))
+     (list #:configure-flags #~'("-DWZ_DISTRIBUTOR=Guix"
+                                 "-DWZ_ENABLE_BACKEND_VULKAN=off"
+                                 "-DENABLE_DISCORD=off")
+           #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing.
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-utfcpp-include
+                          (lambda _
+                            (substitute* "lib/framework/wzstring.cpp"
+                              (("<utfcpp/source/utf8.h>")
+                               "<utf8.h>"))))
+                        (add-after 'unpack 'link-tests-with-qt
+                          (lambda _
+                            (substitute* "tests/Makefile.am"
+                              (("(framework_linktest_LDADD|maptest_LDADD) = "
+                                prefix)
+                               (string-append prefix "$(QT5_LIBS) ")))))
+                        (add-after 'unpack 'fix-ivis-linktest
+                          (lambda _
+                            (substitute* "tests/ivis_linktest.cpp"
+                              (("iV_DrawTextRotated.*;")
+                               (string-append
+                                "iV_DrawTextRotated(\"Press ESC to exit.\", "
+                                "100, 100, 0.0f, font_regular);"))))))))
     (native-inputs (list asciidoc
                      ruby-asciidoctor
                      gettext-minimal
-- 
2.40.1





  reply	other threads:[~2023-05-24 13:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-24 13:36 [bug#63682] [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 iyzsong--- via Guix-patches via
2023-05-24 13:38 ` iyzsong--- via Guix-patches via [this message]
2023-05-24 16:47   ` [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions Liliana Marie Prikler
2023-05-30 10:46     ` bug#63682: [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 宋文武 via Guix-patches via

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e48b0e1d10192d62c83211815574969fd0a63079.1684934823.git.iyzsong@member.fsf.org \
    --to=guix-patches@gnu.org \
    --cc=63682@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=iyzsong@member.fsf.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 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.