diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index 6cebaf75422c..29e59fdb0512 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -4,7 +4,9 @@ fetchFromGitHub, fetchpatch, cmake, + hwloc, ninja, + pkg-config, ctestCheckHook, }: @@ -55,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja ctestCheckHook + pkg-config + ]; + + buildInputs = [ + hwloc ]; doCheck = true; @@ -74,6 +81,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' "" ''; + cmakeFlags = [ + (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false) + ]; + env = { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',