Skip to content

Commit adaa24f

Browse files
authored
tbb_2021_11_0: address feedback from #405670 (#406814)
2 parents e4a95ab + 4ef79e9 commit adaa24f

File tree

2 files changed

+10
-35
lines changed

2 files changed

+10
-35
lines changed

pkgs/development/libraries/tbb/default.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,16 @@ stdenv.mkDerivation rec {
5252
})
5353
# Fix Threads::Threads target for static from https://github.com/oneapi-src/oneTBB/pull/1248
5454
# This is a conflict-resolved cherry-pick of the above PR to due to formatting differences.
55-
./patches/fix-cmake-threads-threads-target-for-static.patch
55+
(fetchpatch {
56+
name = "fix-cmake-threads-threads-target-for-static.patch";
57+
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1248.patch";
58+
hash = "sha256-3WKzxU93vxuy7NgW+ap+ocZz5Q5utZ/pK7+FQExzLLA=";
59+
})
60+
];
61+
62+
patchFlags = [
63+
"-p1"
64+
"--ignore-whitespace"
5665
];
5766

5867
# Fix build with modern gcc

pkgs/development/libraries/tbb/patches/fix-cmake-threads-threads-target-for-static.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)