From 6320b7240f75d11b5a96bc03372a839c53427433 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 20:52:45 +0100 Subject: [PATCH] cataclysm-dda: fix build w/glibc-2.34 * Enable parallel building to speed up the build-time. * Disable tests as vendored catch2 doesn't compile against glibc 2.34 and I couldn't get the tests to run in the sandbox. Failing Hydra build: https://hydra.nixos.org/build/163952121 --- pkgs/games/cataclysm-dda/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index ccba8e23d5a..33790cf8800 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { buildInputs = cursesDeps ++ optionals tiles tilesDeps; + enableParallelBuilding = true; + postPatch = '' patchShebangs . @@ -49,7 +51,7 @@ stdenv.mkDerivation { ''; makeFlags = [ - "PREFIX=$(out)" "LANGUAGES=all" + "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0" (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") ] ++ optionals (!debug) [ "RELEASE=1"