[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: pingus: Adjust for GCC 7.
From: |
guix-commits |
Subject: |
02/05: gnu: pingus: Adjust for GCC 7. |
Date: |
Wed, 30 Oct 2019 20:04:04 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 2ed626bf0d28df44328c1946cd69eb79a853c6e0
Author: Marius Bakke <address@hidden>
Date: Thu Oct 31 00:41:31 2019 +0100
gnu: pingus: Adjust for GCC 7.
Fixes <https://bugs.gnu.org/37946>.
* gnu/packages/games.scm (pingus)[source](modules, snippet): New fields.
---
gnu/packages/games.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 04b06c8..a2917a5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1445,7 +1445,16 @@ fight Morgoth, the Lord of Darkness.")
(base32
"0wp06kcmknsnxz7bjnsndb8x062z7r23fb3yrnbfnj68qhz18y74"))
(patches (search-patches "pingus-boost-headers.patch"
- "pingus-sdl-libs-config.patch"))))
+ "pingus-sdl-libs-config.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "src/pingus/screens/demo_session.cpp"
+ (("#include <iostream>")
+ ;; std::function moved to <functional> with C++ 11.
+ ;; Remove this for versions newer than 0.7.6.
+ "#include <iostream>\n#include <functional>"))
+ #t))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("scons-python2" ,scons-python2)))