alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

arangodb*: fix build w/glibc-2.34

Browse source 
Failing Hydra builds:
* https://hydra.nixos.org/build/155187495 (3.3)
* https://hydra.nixos.org/build/155161270 (3.4)
* https://hydra.nixos.org/build/155154245 (3.5)
This commit is contained in:
Maximilian Bosch 2021-10-13 19:41:31 +02:00
parent f8fc20df2b
commit 65f5fdb818
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/nosql/arangodb/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }:
{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which, catch2, catch }:
let
common = { version, sha256 }: stdenv.mkDerivation {
@ -26,6 +26,14 @@ let
# with nixpkgs, it has no sense to check for a version update
substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
${if (lib.versionOlder version "3.4") then ''
cp ${catch}/include/catch/catch.hpp 3rdParty/catch/catch.hpp
'' else if (lib.versionOlder version "3.5") then ''
cp ${catch2}/include/catch2/catch.hpp 3rdParty/catch/catch.hpp
'' else ''
(cd 3rdParty/boost/1.69.0 && patch -p1 < ${../../../development/libraries/boost/pthread-stack-min-fix.patch})
''}
'';
cmakeFlags = [