From 7c5781615febc475d9b33ae07d2cdf634b50a783 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 14:35:47 +0200 Subject: [PATCH] trafficserver: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155205200 --- pkgs/servers/http/trafficserver/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 9058a4cbda75..06d640a5bc00 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -13,6 +13,7 @@ , python3 , xz , zlib +, catch2 # recommended dependencies , withHwloc ? true , hwloc @@ -113,6 +114,8 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' + + cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux'