diff options
author | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
commit | 54d9479d8adf86e486d02267427829f43e7042b6 (patch) | |
tree | f4f1d7a9e0856bee3dadd1f7e2999159302275cb /gnu/packages/games.scm | |
parent | 52cabc6f87eb1ceebd953b423e458e3c48f847ca (diff) | |
parent | d771ba62f8b23cf71ad82b3423da36416e8a1e8d (diff) | |
download | guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/games.scm')
-rw-r--r-- | gnu/packages/games.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4c297005dc..60d885500c 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))) |