diff mbox series

[bug#49871,2/3] gnu: endless-sky: Clean up phases.

Message ID 20210804104932.2469-2-timotej.lazar@araneo.si
State Accepted
Headers show
Series Update endless-sky | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Timotej Lazar Aug. 4, 2021, 10:49 a.m. UTC 
* 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 mbox series

Patch

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