rekado pushed a commit to branch master
in repository guix.
commit 77c729baf2eee1b6ea0b764519c684f1eab18400
Author: Ricardo Wurmus <[email protected]>
Date: Thu May 25 10:26:58 2017 +0200
gnu: warzone2100: Use modular Qt.
* gnu/packages/games.scm (warzone2100)[inputs]: Remove qt, add qtbase and
qtscript.
[arguments]: Add build phase "patch-for-qt5.8".
---
gnu/packages/games.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4c29700..60d8855 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2784,6 +2784,12 @@ fullscreen, use F5 or Alt+Enter.")
(lambda _
(substitute* "icons/Makefile.in"
(("\\$\\(INSTALL_DATA\\)
\\$\\(srcdir\\)/warzone2100.appdata.xml.*") ""))
+ #t))
+ (add-after 'unpack 'patch-for-qt5.8
+ (lambda _
+ (substitute* "lib/widget/editbox.cpp"
+ (("== '\\\\0'")
+ "== QChar('\\0')"))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)
("unzip" ,unzip)
@@ -2797,7 +2803,8 @@ fullscreen, use F5 or Alt+Enter.")
("libxrandr" ,libxrandr)
("openal" ,openal)
("physfs" ,physfs)
- ("qt" ,qt)
+ ("qtbase" ,qtbase)
+ ("qtscript" ,qtscript)
("openssl" ,openssl)
("quesoglc" ,quesoglc)
("sdl2" ,sdl2)))
