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/servers/nosql/arangodb | |
| 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/servers/nosql/arangodb')
| -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; { |