[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: endless-sky: Clean up phases.
From: |
guix-commits |
Subject: |
02/04: gnu: endless-sky: Clean up phases. |
Date: |
Thu, 5 Aug 2021 03:04:51 -0400 (EDT) |
ngz pushed a commit to branch master
in repository guix.
commit fd85c59d1e7e6111e9c625930c633994c66075eb
Author: Timotej Lazar <timotej.lazar@araneo.si>
AuthorDate: Wed Aug 4 12:49:31 2021 +0200
gnu: endless-sky: Clean up phases.
* gnu/packages/games.scm (endless-sky)[arguments]: Drop unused substitution
and merge existing phases into 'fix-paths.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
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 e46d940..8d9550a 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