Skip to content
Merged
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
4 changes: 2 additions & 2 deletions pkgs/by-name/tb/tbb_2021/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "tbb";
version = "2021.13.0";
version = "2021.12.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another PR that needs 2021.13.0 so rolling back to 2021.12.0 isn't a good permanent fix:

#415996

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should fix Nix first. Maybe we could update blender to use tbb_2022.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. I approve the changes but don't have merge rights.

Ultimately the macOS TBB build needs to be investigated by someone knowledgeable about nix on Darwin because this issue with segfaults has happened a few times before. I noted when I encountered it previously that the segfaults don't happen with the homebrew TBB so there is probably something wrong with how we are packaging it.


outputs = [
"out"
Expand All @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "oneapi-src";
repo = "oneTBB";
tag = "v${finalAttrs.version}";
hash = "sha256-ZoUzY71SweVQ8/1k09MNSXiEqab6Ae+QTbxORnar9JU=";
hash = "sha256-yG/Fs+3f9hNKzZ8le+W7+JDZk9hMzPsVAzbq0yTcUTc=";
};

nativeBuildInputs = [
Expand Down
Loading