treewide: tbb -> onetbb

This commit is contained in:
Emily
2025-09-14 16:48:07 +01:00
parent bcd5d16e67
commit f2b94e3da0
34 changed files with 70 additions and 71 deletions

View File

@@ -19,7 +19,7 @@
boost, boost,
mpfr, mpfr,
xercesc, xercesc,
tbb, onetbb,
embree, embree,
vcg, vcg,
libigl, libigl,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
boost boost
mpfr mpfr
xercesc xercesc
tbb onetbb
embree embree
vcg vcg
libigl libigl

View File

@@ -203,7 +203,7 @@ rec {
glew110 glew110
openssl openssl
libidn libidn
tbb onetbb
wayland wayland
libgbm libgbm
libxkbcommon libxkbcommon

View File

@@ -9,7 +9,7 @@
# Not setting an explicit target makes it default to the generic target. # Not setting an explicit target makes it default to the generic target.
targets ? null, targets ? null,
enablePstlTests ? false, enablePstlTests ? false,
tbb, onetbb,
cmake, cmake,
boost, boost,
}: }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
tbb onetbb
]; ];
buildInputs = [ boost ]; buildInputs = [ boost ];

View File

@@ -5,7 +5,7 @@
cmake, cmake,
perl, perl,
python3, python3,
tbb, onetbb,
zlib, zlib,
runCommand, runCommand,
bowtie2, bowtie2,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
tbb onetbb
zlib zlib
python3 python3
perl perl

View File

@@ -7,7 +7,7 @@
gst_all_1, gst_all_1,
cmake, cmake,
libglvnd, libglvnd,
tbb, onetbb,
ninja, ninja,
pkg-config, pkg-config,
}: }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools qt6.qttools
qt6.qtwayland qt6.qtwayland
qt6.wrapQtAppsHook qt6.wrapQtAppsHook
tbb onetbb
]; ];
patches = [ patches = [

View File

@@ -15,7 +15,7 @@
mpfr, mpfr,
pcl, pcl,
libsForQt5, libsForQt5,
tbb, onetbb,
xercesc, xercesc,
wrapGAppsHook3, wrapGAppsHook3,
}: }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
libsForQt5.qtbase libsForQt5.qtbase
libsForQt5.qtsvg libsForQt5.qtsvg
libsForQt5.qttools libsForQt5.qttools
tbb onetbb
xercesc xercesc
]; ];

View File

@@ -16,7 +16,7 @@
pkg-config, pkg-config,
SDL2, SDL2,
SDL2_image, SDL2_image,
tbb, onetbb,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
luajit luajit
minizip minizip
SDL2_image SDL2_image
tbb onetbb
]; ];
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };

View File

@@ -11,7 +11,7 @@
libGL, libGL,
libpng, libpng,
openexr, openexr,
tbb, onetbb,
xorg, xorg,
ilmbase, ilmbase,
llvmPackages, llvmPackages,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
libGL libGL
libpng libpng
openexr openexr
tbb onetbb
xorg.libX11 xorg.libX11
xorg.libXcursor xorg.libXcursor
xorg.libXext xorg.libXext

View File

@@ -35,7 +35,7 @@
rubberband, rubberband,
soundtouch, soundtouch,
speexdsp, speexdsp,
tbb, onetbb,
wrapGAppsHook4, wrapGAppsHook4,
zam-plugins, zam-plugins,
zita-convolver, zita-convolver,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
rubberband rubberband
soundtouch soundtouch
speexdsp' speexdsp'
tbb onetbb
zita-convolver zita-convolver
]; ];

View File

@@ -12,7 +12,7 @@
libGLU, libGLU,
opencascade-occt, opencascade-occt,
qt6Packages, qt6Packages,
tbb, onetbb,
vtkWithQt6, vtkWithQt6,
llvmPackages, llvmPackages,
}: }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
libGL libGL
libGLU libGLU
opencascade-occt opencascade-occt
tbb onetbb
vtkWithQt6 vtkWithQt6
] ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp; ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

View File

@@ -63,7 +63,7 @@ buildFHSEnv {
libepoxy libepoxy
lz4 lz4
lz4.dev lz4.dev
tbb onetbb
libxkbcommon libxkbcommon
librealsense librealsense
boost boost

View File

@@ -8,7 +8,7 @@
gzip, gzip,
libXt, libXt,
openusd, openusd,
tbb, onetbb,
vtk, vtk,
autoPatchelfHook, autoPatchelfHook,
python3Packages, python3Packages,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withUsd [ ++ lib.optionals withUsd [
libXt libXt
openusd openusd
tbb onetbb
]; ];
cmakeFlags = [ cmakeFlags = [

View File

@@ -36,7 +36,7 @@ buildFHSEnv {
libdrm libdrm
libxkbcommon libxkbcommon
libudev0-shim libudev0-shim
tbb onetbb
xwayland xwayland
qt5.qtwayland qt5.qtwayland
net-tools # needed by licensing tools net-tools # needed by licensing tools

View File

@@ -10,7 +10,7 @@
flex, flex,
llvmPackages, llvmPackages,
ncurses, ncurses,
tbb, onetbb,
# the default test target is sse4, but that is not supported by all Hydra agents # the default test target is sse4, but that is not supported by all Hydra agents
testedTargets ? testedTargets ?
if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
flex flex
python3 python3
llvmPackages.libllvm.dev llvmPackages.libllvm.dev
tbb onetbb
]; ];
buildInputs = with llvmPackages; [ buildInputs = with llvmPackages; [

View File

@@ -17,7 +17,7 @@
boost, boost,
mpfr, mpfr,
xercesc, xercesc,
tbb, onetbb,
embree, embree,
libigl, libigl,
corto, corto,
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
boost boost
mpfr mpfr
xercesc xercesc
tbb onetbb
embree embree
libigl libigl
corto corto

View File

@@ -17,7 +17,7 @@
boost, boost,
mpfr, mpfr,
xercesc, xercesc,
tbb, onetbb,
embree, embree,
vcg, vcg,
libigl, libigl,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
boost boost
mpfr mpfr
xercesc xercesc
tbb onetbb
embree embree
vcg vcg
libigl libigl

View File

@@ -10,7 +10,7 @@
fltk, fltk,
vtk, vtk,
zlib, zlib,
tbb, onetbb,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
fltk fltk
libGLU libGLU
python3 python3
tbb onetbb
vtk vtk
zlib zlib
]; ];

View File

@@ -8,7 +8,7 @@
lib, lib,
python3, python3,
stdenv, stdenv,
tbb, onetbb,
xcodebuild, xcodebuild,
}: }:
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
buildInputs = [ buildInputs = [
tbb onetbb
] ]
++ lib.optionals cudaSupport [ ++ lib.optionals cudaSupport [
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport)
(lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include") (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include")
(lib.cmakeFeature "TBB_ROOT" "${tbb}") (lib.cmakeFeature "TBB_ROOT" "${onetbb}")
]; ];
meta = { meta = {

View File

@@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
ninja, ninja,
stdenv, stdenv,
tbb, onetbb,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ buildInputs = [
tbb onetbb
]; ];
cmakeFlags = [ cmakeFlags = [
"-DOPENPGL_BUILD_STATIC=OFF" "-DOPENPGL_BUILD_STATIC=OFF"
"-DTBB_ROOT=${tbb.out}" "-DTBB_ROOT=${onetbb.out}"
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString ( env.NIX_CFLAGS_COMPILE = lib.optionalString (

View File

@@ -17,7 +17,7 @@
spectra, spectra,
stdenv, stdenv,
swig, swig,
tbb, onetbb,
# Boolean flags # Boolean flags
runTests ? false, # tests take an hour to build on a 48-core machine runTests ? false, # tests take an hour to build on a 48-core machine
enablePython ? false, enablePython ? false,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
pagmo2 pagmo2
spectra spectra
swig swig
tbb onetbb
] ]
++ lib.optionals enablePython [ ++ lib.optionals enablePython [
python3Packages.dill python3Packages.dill

View File

@@ -6,7 +6,7 @@
boost, boost,
jemalloc, jemalloc,
c-blosc, c-blosc,
tbb, onetbb,
zlib, zlib,
}: }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost boost
tbb onetbb
jemalloc jemalloc
c-blosc c-blosc
zlib zlib

View File

@@ -7,7 +7,7 @@
nlopt, nlopt,
ipopt, ipopt,
boost, boost,
tbb, onetbb,
# tests pass but take 30+ minutes # tests pass but take 30+ minutes
runTests ? false, runTests ? false,
}: }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
eigen eigen
nlopt nlopt
boost boost
tbb onetbb
] ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt;

View File

@@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
boost, boost,
tbb, onetbb,
makeWrapper, makeWrapper,
}: }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
boost boost
tbb onetbb
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View File

@@ -12,7 +12,7 @@
dbus, dbus,
freetype, freetype,
glfw, glfw,
tbb, onetbb,
withGtkFileSelector ? false, withGtkFileSelector ? false,
gtk3, gtk3,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
capstone capstone
freetype freetype
tbb onetbb
] ]
++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]

View File

@@ -6,7 +6,7 @@
cmake, cmake,
ninja, ninja,
llvmPackages, llvmPackages,
tbb, onetbb,
mpi, mpi,
mpiSupport ? true, mpiSupport ? true,
testers, testers,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
tbb onetbb
] ]
++ lib.optional mpiSupport mpi ++ lib.optional mpiSupport mpi
++ lib.optional stdenv.cc.isClang llvmPackages.openmp; ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

View File

@@ -50,7 +50,7 @@
xcbutilrenderutil, xcbutilrenderutil,
xcbutilwm, xcbutilwm,
p7zip, p7zip,
tbb, onetbb,
wayland, wayland,
libXScrnSaver, libXScrnSaver,
}: }:
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
xcbutilkeysyms xcbutilkeysyms
xcbutilrenderutil xcbutilrenderutil
xcbutilwm xcbutilwm
tbb onetbb
wayland wayland
]; ];

View File

@@ -5,7 +5,7 @@
cmake, cmake,
pkg-config, pkg-config,
ispc, ispc,
tbb, onetbb,
glfw, glfw,
openimageio, openimageio,
libjpeg, libjpeg,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
"-DEMBREE_TUTORIALS=OFF" "-DEMBREE_TUTORIALS=OFF"
"-DEMBREE_RAY_MASK=ON" "-DEMBREE_RAY_MASK=ON"
"-DTBB_ROOT=${tbb}" "-DTBB_ROOT=${onetbb}"
"-DTBB_INCLUDE_DIR=${tbb.dev}/include" "-DTBB_INCLUDE_DIR=${onetbb.dev}/include"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
cmake cmake
]; ];
buildInputs = [ buildInputs = [
tbb onetbb
glfw glfw
openimageio openimageio
libjpeg libjpeg

View File

@@ -69,7 +69,7 @@
tesseract, tesseract,
leptonica, leptonica,
enableTbb ? false, enableTbb ? false,
tbb, onetbb,
enableOvis ? false, enableOvis ? false,
ogre, ogre,
enableGPhoto2 ? false, enableGPhoto2 ? false,
@@ -406,7 +406,7 @@ effectiveStdenv.mkDerivation {
leptonica leptonica
] ]
++ optionals enableTbb [ ++ optionals enableTbb [
tbb onetbb
] ]
++ optionals effectiveStdenv.hostPlatform.isDarwin [ ++ optionals effectiveStdenv.hostPlatform.isDarwin [
bzip2 bzip2

View File

@@ -69,7 +69,7 @@
opencascade-occt, opencascade-occt,
# threading # threading
tbb, onetbb,
llvmPackages, llvmPackages,
# rendering # rendering
@@ -108,7 +108,6 @@ let
throw ''qtVersion must be "5", "6" or null''; throw ''qtVersion must be "5", "6" or null'';
vtkPackages = lib.makeScope newScope (self: { vtkPackages = lib.makeScope newScope (self: {
inherit inherit
tbb
mpi mpi
mpiSupport mpiSupport
python3Packages python3Packages
@@ -205,13 +204,13 @@ stdenv.mkDerivation (finalAttrs: {
libtheora libtheora
cli11 cli11
openslide openslide
onetbb
vtkPackages.hdf5 vtkPackages.hdf5
vtkPackages.cgns vtkPackages.cgns
vtkPackages.adios2 vtkPackages.adios2
vtkPackages.netcdf vtkPackages.netcdf
vtkPackages.catalyst vtkPackages.catalyst
vtkPackages.viskores vtkPackages.viskores
vtkPackages.tbb
] ]
++ lib.optionals stdenv.cc.isClang [ ++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp llvmPackages.openmp

View File

@@ -9,7 +9,7 @@
cgal, cgal,
cmake, cmake,
gmp, gmp,
tbb, onetbb,
LAStools, LAStools,
eigen, eigen,
mpfr, mpfr,
@@ -45,7 +45,7 @@ buildPythonPackage rec {
mpfr mpfr
boost boost
zlib zlib
tbb onetbb
eigen eigen
] ]
++ lib.optionals withLAS [ ++ lib.optionals withLAS [

View File

@@ -9,7 +9,7 @@
gmp, gmp,
cgal, cgal,
mpfr, mpfr,
tbb, onetbb,
numpy, numpy,
cython, cython,
pybind11, pybind11,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
cgal cgal
mpfr mpfr
] ]
++ lib.optionals enableTBB [ tbb ]; ++ lib.optionals enableTBB [ onetbb ];
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy
scipy scipy

View File

@@ -33,7 +33,7 @@
python, python,
qt6, qt6,
setuptools, setuptools,
tbb, onetbb,
withDocs ? false, withDocs ? false,
withOsl ? true, withOsl ? true,
withTools ? false, withTools ? false,
@@ -126,7 +126,7 @@ buildPythonPackage rec {
opencolorio opencolorio
openimageio openimageio
ptex ptex
tbb onetbb
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11 libX11

View File

@@ -18,7 +18,7 @@
python3, python3,
qtbase, qtbase,
qttools, qttools,
tbb, onetbb,
unshield, unshield,
wrapQtAppsHook, wrapQtAppsHook,
xz, xz,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
minizip minizip
qtbase qtbase
qttools qttools
tbb onetbb
xz xz
zlib zlib
]; ];

View File

@@ -15,7 +15,7 @@
jq, jq,
gcc, gcc,
elfutils, elfutils,
tbb, onetbb,
protobuf, protobuf,
grpc, grpc,
yaml-cpp, yaml-cpp,
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
openssl openssl
curl curl
jq jq
tbb onetbb
re2 re2
protobuf protobuf
grpc grpc