diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 /pkgs/games/openspades | |
parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
download | nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.zip |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
Diffstat (limited to 'pkgs/games/openspades')
-rw-r--r-- | pkgs/games/openspades/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index d263be3ec115..143fa21ce2e5 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { --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 + sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h ''; nativeBuildInputs = |