diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-13 19:41:31 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:26:49 +0100 |
| commit | 65f5fdb81823a4875e8c714211ef117d3ededadf (patch) | |
| tree | dffa87957ef3f92e8c56ae01910504631e03b89d | |
| parent | f8fc20df2b7bdae96c8b8abfae13f70437cc80bd (diff) | |
| download | nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar.gz nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar.bz2 nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar.lz nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar.xz nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.tar.zst nixpkgs-65f5fdb81823a4875e8c714211ef117d3ededadf.zip | |
arangodb*: fix build w/glibc-2.34
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)
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index bf7f7b43960..d9f1892beca 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -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 = [ |