Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions pkgs/development/libraries/tbb/2022_0.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
}:

stdenv.mkDerivation rec {
pname = "tbb";
version = "2022.0.0";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
tag = "v${version}";
hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
};

nativeBuildInputs = [
cmake
];

patches = [
# Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
];

# Fix build with modern gcc
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" ] ++
# error: variable 'val' set but not used
lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++
# Workaround for gcc-12 ICE when using -O3
# https://gcc.gnu.org/PR108854
lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ];

# Fix undefined reference errors with version script under LLVM.
NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version";

# Disable failing test on musl
# test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace test/CMakeLists.txt \
--replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
'';

meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20;
longDescription = ''
Intel Threading Building Blocks offers a rich and complete approach to
expressing parallelism in a C++ program. It is a library that helps you
take advantage of multi-core processor performance without having to be a
threading expert. Intel TBB is not just a threads-replacement library. It
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice tmarkus ];
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7100,6 +7100,7 @@ with pkgs;
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;
tbb_2021_11 = callPackage ../development/libraries/tbb { };
tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
# many packages still fail with latest version
tbb = tbb_2020_3;

Expand Down
Loading