diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
| commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
| tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/servers/nosql | |
| parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
| download | nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip | |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 8b8d1ba0ae16..ffcd507653a0 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -11,13 +11,6 @@ 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 ]; @@ -26,6 +19,12 @@ 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; { |