[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: stepmania: Fix all instances of accessing application data.
From: |
guix-commits |
Subject: |
01/01: gnu: stepmania: Fix all instances of accessing application data. |
Date: |
Fri, 29 Mar 2019 09:16:08 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 4774677228689df7c56efedc55c6ee06cd1e172d
Author: Ricardo Wurmus <address@hidden>
Date: Fri Mar 29 14:14:19 2019 +0100
gnu: stepmania: Fix all instances of accessing application data.
This is a follow-up to commit 45aba232abe50b6642abfaa06030985c7febbe07.
* gnu/packages/games.scm (stepmania)[arguments]: Rename phase
ensure-gtk-module-can-be-found to ensure-application-files-can-be-found and
fix remaining instances of application data access.
---
gnu/packages/games.scm | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7e08f8..5340ae5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6182,12 +6182,21 @@ civilized than your own.")
"/lib/glib-2.0/include"))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'ensure-gtk-module-can-be-found
+ (add-after 'unpack 'ensure-application-files-can-be-found
(lambda* (#:key outputs #:allow-other-keys)
- (substitute* "src/arch/LoadingWindow/LoadingWindow_Gtk.cpp"
- (("RageFileManagerUtil::sDirOfExecutable \\+ \"/\" \\+
\"GtkModule.so\"")
- (string-append "\"" (assoc-ref outputs "out")
- "/share/stepmania/GtkModule.so\"")))
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "src/arch/LoadingWindow/LoadingWindow_Gtk.cpp"
+ (("RageFileManagerUtil::sDirOfExecutable \\+ \"/\" \\+
\"GtkModule.so\"")
+ (string-append "\"" out
+ "/share/stepmania/GtkModule.so\"")))
+ (substitute* "src/arch/ArchHooks/ArchHooks_Unix.cpp"
+ (("Root = sDirOfExecutable")
+ (string-append "Root = \"" out "/share/stepmania/\""))
+ (("sDirOfExecutable \\+ \"/(Packages|Songs)\"" _ dir)
+ (string-append "\"" out "/share/stepmania/" dir "\"")))
+ (substitute* "src/RageFileManager.cpp"
+ (("RageFileManagerUtil::sDirOfExecutable \\+ \"/\"")
+ (string-append "\"" out "/share/stepmania/\""))))
#t))
(add-after 'unpack 'fix-install-subdir
;; Installation would be done in "%out/stepmania-X.Y", but we