diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
| commit | c05d8295988697adbb920a7b4a999ae3670c5504 (patch) | |
| tree | 7a5526cffad30206f814560c72f13829e4d9c396 /pkgs/servers/nosql | |
| parent | f073df60d60444c30c49cb26d6b187a4100b41fe (diff) | |
| parent | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (diff) | |
| download | nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.gz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.bz2 nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.lz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.xz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.zst nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
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; { |