diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:45:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:45:47 +0200 |
| commit | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (patch) | |
| tree | 87832ada29cd244ad12822f21517f1bee2047fdf | |
| parent | b626e8383828c4888507c6cd47847569ced422e0 (diff) | |
| download | nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar.gz nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar.bz2 nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar.lz nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar.xz nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.tar.zst nixlib-ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7.zip | |
openspades, arangodb: more #include error fixups
... after gcc-5.4.
| -rw-r--r-- | pkgs/games/openspades/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 13 |
2 files changed, 8 insertions, 6 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 = diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index ffcd507653a0..8b8d1ba0ae16 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; }; + postPatch = '' + substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash + substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash + sed '1i#include <cmath>' -i arangod/Aql/Functions.cpp \ + -i lib/Basics/string-buffer.cpp + ''; + buildInputs = [ openssl zlib python gyp go readline ]; @@ -19,12 +26,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - patchPhase = '' - substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash - substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { |