public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix #include errors after gcc-5.4

Browse Source 
They were mostly missing <cmath> or <math.h>.
This commit is contained in:
Vladimír Čunát
2016-06-19 10:18:30 +02:00
parent d133a168f0
commit 97c484a10f
20 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/openspades/default.nix
+4 -1
View File
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
substituteInPlace Sources/Draw/SWMapRenderer.cpp \
--replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \
-i Sources/Draw/SWMapRenderer.cpp
'';
nativeBuildInputs =
pkgs/games/openspades/git.nix
+2
View File
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
};
postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
nativeBuildInputs =
with stdenv.lib;
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]