Skip to content

[Backport release-24.11] Backport 401250 to release 24.11 #402875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 5 commits into from
Apr 29, 2025
Merged

[Backport release-24.11] Backport 401250 to release 24.11 #402875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b398eb0
tbb_{2021_11,2022_0}: Use Ninja, build in parallel
Ericson2314 Apr 6, 2025
3967834
tbb_{2021_11,2022_0}: Fix build on Windows
Ericson2314 Apr 6, 2025
469c1b9
tbb: fix tests on FreeBSD and Windows
silvanshade Apr 23, 2025
58623d3
libblake3: fix FreeBSD cross-compile builds
silvanshade Apr 23, 2025
a526600
libblake3: fix duplicate patch fields
silvanshade Apr 29, 2025
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
6 changes: 6 additions & 0 deletions pkgs/by-name/li/libblake3/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-npCtM8nOFU8Tcu//IykjMs8aLU12d93+mIfKuxHkuaQ=";
relative = "c";
})
# build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477)
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch";
hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";
relative = "c";
})
];

sourceRoot = finalAttrs.src.name + "/c";
Expand Down
12 changes: 11 additions & 1 deletion pkgs/development/libraries/tbb/2022_0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
fetchFromGitHub,
fetchpatch,
cmake,
ninja,
}:

stdenv.mkDerivation rec {
Expand All @@ -24,6 +25,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
ninja
];

patches = [
Expand All @@ -32,6 +34,12 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
# Fix tests on FreeBSD and Windows
(fetchpatch {
name = "fix-tbb-freebsd-and-windows-tests.patch";
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
})
];

# Fix build with modern gcc
Expand Down Expand Up @@ -61,6 +69,8 @@ stdenv.mkDerivation rec {
--replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
'';

enableParallelBuilding = true;

meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
Expand All @@ -73,7 +83,7 @@ stdenv.mkDerivation rec {
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [
thoughtpolice
tmarkus
Expand Down
22 changes: 21 additions & 1 deletion pkgs/development/libraries/tbb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
fetchFromGitHub,
fetchpatch,
cmake,
ninja,
}:

stdenv.mkDerivation rec {
Expand All @@ -24,6 +25,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
ninja
];

patches = [
Expand All @@ -32,6 +34,22 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
(fetchpatch {
name = "fix-tbb-mingw-compile.patch";
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1361.patch";
hash = "sha256-jVa4HQetZv0vImdv549MyTy6/8t9dy8m6YAmjPGNQ18=";
})
(fetchpatch {
name = "fix-tbb-mingw-link.patch";
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";
hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";
})
# Fix tests on FreeBSD and Windows
(fetchpatch {
name = "fix-tbb-freebsd-and-windows-tests.patch";
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
})
];

# Fix build with modern gcc
Expand Down Expand Up @@ -61,6 +79,8 @@ stdenv.mkDerivation rec {
--replace 'conformance_resumable_tasks' ""
'';

enableParallelBuilding = true;

meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
Expand All @@ -73,7 +93,7 @@ stdenv.mkDerivation rec {
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [
thoughtpolice
tmarkus
Expand Down