From c905ab58a2fe60e0a34b3c1ed13b28b573267da3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Oct 2021 14:18:20 +0200 Subject: [PATCH] trenchbroom: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155141010 --- pkgs/applications/misc/trenchbroom/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 8a7025060607..a49fbf71191e 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -21,6 +21,19 @@ stdenv.mkDerivation rec { --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ --subst-var-by GIT_DESCRIBE v${version} + + # Tests don't compile because of vendored `catch2` being incompatible with glibc-2.34. + # Also, no need to since we don't even run them. + substituteInPlace lib/CMakeLists.txt \ + --replace "add_subdirectory(Catch2)" "" + substituteInPlace lib/vecmath/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" \ + --replace "add_subdirectory(lib)" "" + substituteInPlace lib/kdl/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + substituteInPlace common/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" \ + --replace "add_subdirectory(benchmark)" "" ''; nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems ];