unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Timotej Lazar <timotej.lazar@araneo.si>
To: 49871@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#49871] [PATCH 2/3] gnu: endless-sky: Clean up phases.
Date: Wed,  4 Aug 2021 12:49:31 +0200	[thread overview]
Message-ID: <20210804104932.2469-2-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20210804104932.2469-1-timotej.lazar@araneo.si>

* gnu/packages/games.scm (endless-sky)[arguments]: Drop unused substitution
and merge existing phases into 'fix-paths.
---
 gnu/packages/games.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 792ff64a07..9a595162de 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8368,19 +8368,13 @@ your score gets higher, you level up and the blocks fall faster.")
        #:tests? #f ; no tests
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-resource-locations
+         (add-after 'unpack 'fix-paths
            (lambda* (#:key outputs #:allow-other-keys)
+             ;; Look for resources in the store directory.
              (substitute* "source/Files.cpp"
-               (("/usr/local/")
-                (string-append (assoc-ref outputs "out") "/")))
-             #t))
-         (add-after 'unpack 'patch-scons
-           (lambda _
+               (("/usr/local") (assoc-ref outputs "out")))
+             ;; Install game binary into %out/bin.
              (substitute* "SConstruct"
-               ;; Keep environmental variables
-               (("Environment\\(\\)")
-                "Environment(ENV = os.environ)")
-               ;; Install into %out/bin
                (("games\"") "bin\""))
              #t))
          (add-before 'build 'use-gcc-ar
-- 
2.32.0





  reply	other threads:[~2021-08-04 10:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-04 10:45 [bug#49871] [PATCH 0/3] Update endless-sky Timotej Lazar
2021-08-04 10:49 ` [bug#49871] [PATCH 1/3] gnu: endless-sky: Update to 0.9.14 Timotej Lazar
2021-08-04 10:49   ` Timotej Lazar [this message]
2021-08-04 10:49   ` [bug#49871] [PATCH 3/3] gnu: endless-sky: Enable tests Timotej Lazar
2021-08-05  7:05 ` bug#49871: [PATCH 0/3] Update endless-sky 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=20210804104932.2469-2-timotej.lazar@araneo.si \
    --to=timotej.lazar@araneo.si \
    --cc=49871@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).