nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

openspades, arangodb: more #include error fixups

Browse Source 
... after gcc-5.4.
This commit is contained in:
Vladimír Čunát 2016-06-22 10:45:47 +02:00
parent b626e83838
commit ebf1cb28a2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/games/openspades/default.nix
View File

@ -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 =

13
pkgs/servers/nosql/arangodb/default.nix
View File

@ -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; {