From faaacb5ce2c82e80a1a1b5f58267512e90d0577f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:17:27 +0100 Subject: [PATCH 1/2] cmake: set CMAKE_BUILD_PARALLEL_LEVEL https://cmake.org/cmake/help/latest/envvar/CMAKE_BUILD_PARALLEL_LEVEL.html --- pkgs/by-name/cm/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 3df8b9bd986b..a6f5a4f57a5b 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -131,6 +131,9 @@ cmakeConfigurePhase() { enableParallelBuilding=1 echo "cmake: enabled parallel building" fi + if [[ "$enableParallelBuilding" -ne 0 ]]; then + export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES + fi if ! [[ -v enableParallelInstalling ]]; then enableParallelInstalling=1 From 5d3a18acc1f71ab276fdea69c743fddd6b9af39e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:19:37 +0100 Subject: [PATCH 2/2] python3Packages.pyhepmc: use default CMAKE_BUILD_PARALLEL_LEVEL --- pkgs/development/python-modules/pyhepmc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 427d9ecabeba..44ee5b78be85 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -43,10 +43,6 @@ buildPythonPackage rec { CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; - preBuild = '' - export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" - ''; - nativeCheckInputs = [ graphviz pytestCheckHook