treewide: tbb -> onetbb

2025-09-14 16:48:07 +01:00
parent bcd5d16e67
commit f2b94e3da0
34 changed files with 70 additions and 71 deletions
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -19,7 +19,7 @@
  boost,
  mpfr,
  xercesc,
-  tbb,
+  onetbb,
  embree,
  vcg,
  libigl,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
    boost
    mpfr
    xercesc
-    tbb
+    onetbb
    embree
    vcg
    libigl
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -203,7 +203,7 @@ rec {
        glew110
        openssl
        libidn
-        tbb
+        onetbb
        wayland
        libgbm
        libxkbcommon
--- a/pkgs/by-name/ad/adaptivecpp/tests.nix
+++ b/pkgs/by-name/ad/adaptivecpp/tests.nix
@@ -9,7 +9,7 @@
  # Not setting an explicit target makes it default to the generic target.
  targets ? null,
  enablePstlTests ? false,
-  tbb,
+  onetbb,
  cmake,
  boost,
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
-    tbb
+    onetbb
  ];
  buildInputs = [ boost ];

--- a/pkgs/by-name/bo/bowtie2/package.nix
+++ b/pkgs/by-name/bo/bowtie2/package.nix
@@ -5,7 +5,7 @@
  cmake,
  perl,
  python3,
-  tbb,
+  onetbb,
  zlib,
  runCommand,
  bowtie2,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [ cmake ];

  buildInputs = [
-    tbb
+    onetbb
    zlib
    python3
    perl
--- a/pkgs/by-name/br/brickstore/package.nix
+++ b/pkgs/by-name/br/brickstore/package.nix
@@ -7,7 +7,7 @@
  gst_all_1,
  cmake,
  libglvnd,
-  tbb,
+  onetbb,
  ninja,
  pkg-config,
 }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
    qt6.qttools
    qt6.qtwayland
    qt6.wrapQtAppsHook
-    tbb
+    onetbb
  ];

  patches = [
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -15,7 +15,7 @@
  mpfr,
  pcl,
  libsForQt5,
-  tbb,
+  onetbb,
  xercesc,
  wrapGAppsHook3,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    libsForQt5.qtbase
    libsForQt5.qtsvg
    libsForQt5.qttools
-    tbb
+    onetbb
    xercesc
  ];

--- a/pkgs/by-name/co/cortex-command-community-project/package.nix
+++ b/pkgs/by-name/co/cortex-command-community-project/package.nix
@@ -16,7 +16,7 @@
  pkg-config,
  SDL2,
  SDL2_image,
-  tbb,
+  onetbb,
 }:

 stdenv.mkDerivation rec {
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
    luajit
    minizip
    SDL2_image
-    tbb
+    onetbb
  ];

  passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -11,7 +11,7 @@
  libGL,
  libpng,
  openexr,
-  tbb,
+  onetbb,
  xorg,
  ilmbase,
  llvmPackages,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
    libGL
    libpng
    openexr
-    tbb
+    onetbb
    xorg.libX11
    xorg.libXcursor
    xorg.libXext
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -35,7 +35,7 @@
  rubberband,
  soundtouch,
  speexdsp,
-  tbb,
+  onetbb,
  wrapGAppsHook4,
  zam-plugins,
  zita-convolver,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
    rubberband
    soundtouch
    speexdsp'
-    tbb
+    onetbb
    zita-convolver
  ];

--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@@ -12,7 +12,7 @@
  libGLU,
  opencascade-occt,
  qt6Packages,
-  tbb,
+  onetbb,
  vtkWithQt6,
  llvmPackages,
 }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    libGL
    libGLU
    opencascade-occt
-    tbb
+    onetbb
    vtkWithQt6
  ]
  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -63,7 +63,7 @@ buildFHSEnv {
          libepoxy
          lz4
          lz4.dev
-          tbb
+          onetbb
          libxkbcommon
          librealsense
          boost
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -8,7 +8,7 @@
  gzip,
  libXt,
  openusd,
-  tbb,
+  onetbb,
  vtk,
  autoPatchelfHook,
  python3Packages,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
  ++ lib.optionals withUsd [
    libXt
    openusd
-    tbb
+    onetbb
  ];

  cmakeFlags = [
--- a/pkgs/by-name/ho/houdini/package.nix
+++ b/pkgs/by-name/ho/houdini/package.nix
@@ -36,7 +36,7 @@ buildFHSEnv {
      libdrm
      libxkbcommon
      libudev0-shim
-      tbb
+      onetbb
      xwayland
      qt5.qtwayland
      net-tools # needed by licensing tools
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -10,7 +10,7 @@
  flex,
  llvmPackages,
  ncurses,
-  tbb,
+  onetbb,
  # the default test target is sse4, but that is not supported by all Hydra agents
  testedTargets ?
    if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
    flex
    python3
    llvmPackages.libllvm.dev
-    tbb
+    onetbb
  ];

  buildInputs = with llvmPackages; [
--- a/pkgs/by-name/me/meshlab-unstable/package.nix
+++ b/pkgs/by-name/me/meshlab-unstable/package.nix
@@ -17,7 +17,7 @@
  boost,
  mpfr,
  xercesc,
-  tbb,
+  onetbb,
  embree,
  libigl,
  corto,
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
    boost
    mpfr
    xercesc
-    tbb
+    onetbb
    embree
    libigl
    corto
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -17,7 +17,7 @@
  boost,
  mpfr,
  xercesc,
-  tbb,
+  onetbb,
  embree,
  vcg,
  libigl,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
    boost
    mpfr
    xercesc
-    tbb
+    onetbb
    embree
    vcg
    libigl
--- a/pkgs/by-name/mi/mirtk/package.nix
+++ b/pkgs/by-name/mi/mirtk/package.nix
@@ -10,7 +10,7 @@
  fltk,
  vtk,
  zlib,
-  tbb,
+  onetbb,
 }:

 stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
    fltk
    libGLU
    python3
-    tbb
+    onetbb
    vtk
    zlib
  ];
--- a/pkgs/by-name/op/openimagedenoise/package.nix
+++ b/pkgs/by-name/op/openimagedenoise/package.nix
@@ -8,7 +8,7 @@
  lib,
  python3,
  stdenv,
-  tbb,
+  onetbb,
  xcodebuild,
 }:

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];

  buildInputs = [
-    tbb
+    onetbb
  ]

  ++ lib.optionals cudaSupport [
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {

  cmakeFlags = [
    (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport)
-    (lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include")
-    (lib.cmakeFeature "TBB_ROOT" "${tbb}")
+    (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include")
+    (lib.cmakeFeature "TBB_ROOT" "${onetbb}")
  ];

  meta = {
--- a/pkgs/by-name/op/openpgl/package.nix
+++ b/pkgs/by-name/op/openpgl/package.nix
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  ninja,
  stdenv,
-  tbb,
+  onetbb,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    tbb
+    onetbb
  ];

  cmakeFlags = [
    "-DOPENPGL_BUILD_STATIC=OFF"
-    "-DTBB_ROOT=${tbb.out}"
+    "-DTBB_ROOT=${onetbb.out}"
  ];

  env.NIX_CFLAGS_COMPILE = lib.optionalString (
--- a/pkgs/by-name/op/openturns/package.nix
+++ b/pkgs/by-name/op/openturns/package.nix
@@ -17,7 +17,7 @@
  spectra,
  stdenv,
  swig,
-  tbb,
+  onetbb,
  # Boolean flags
  runTests ? false, # tests take an hour to build on a 48-core machine
  enablePython ? false,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
    pagmo2
    spectra
    swig
-    tbb
+    onetbb
  ]
  ++ lib.optionals enablePython [
    python3Packages.dill
--- a/pkgs/by-name/op/openvdb/package.nix
+++ b/pkgs/by-name/op/openvdb/package.nix
@@ -6,7 +6,7 @@
  boost,
  jemalloc,
  c-blosc,
-  tbb,
+  onetbb,
  zlib,
 }:

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    boost
-    tbb
+    onetbb
    jemalloc
    c-blosc
    zlib
--- a/pkgs/by-name/pa/pagmo2/package.nix
+++ b/pkgs/by-name/pa/pagmo2/package.nix
@@ -7,7 +7,7 @@
  nlopt,
  ipopt,
  boost,
-  tbb,
+  onetbb,
  # tests pass but take 30+ minutes
  runTests ? false,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    eigen
    nlopt
    boost
-    tbb
+    onetbb
  ]
  ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt;

--- a/pkgs/by-name/po/potreeconverter/package.nix
+++ b/pkgs/by-name/po/potreeconverter/package.nix
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  cmake,
  boost,
-  tbb,
+  onetbb,
  makeWrapper,
 }:

@@ -21,7 +21,7 @@ stdenv.mkDerivation {

  buildInputs = [
    boost
-    tbb
+    onetbb
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -12,7 +12,7 @@
  dbus,
  freetype,
  glfw,
-  tbb,
+  onetbb,

  withGtkFileSelector ? false,
  gtk3,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    capstone
    freetype
-    tbb
+    onetbb
  ]
  ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
  ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
--- a/pkgs/by-name/vi/viskores/package.nix
+++ b/pkgs/by-name/vi/viskores/package.nix
@@ -6,7 +6,7 @@
  cmake,
  ninja,
  llvmPackages,
-  tbb,
+  onetbb,
  mpi,
  mpiSupport ? true,
  testers,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  propagatedBuildInputs = [
-    tbb
+    onetbb
  ]
  ++ lib.optional mpiSupport mpi
  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -50,7 +50,7 @@
  xcbutilrenderutil,
  xcbutilwm,
  p7zip,
-  tbb,
+  onetbb,
  wayland,
  libXScrnSaver,
 }:
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
    xcbutilkeysyms
    xcbutilrenderutil
    xcbutilwm
-    tbb
+    onetbb
    wayland
  ];

--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@@ -5,7 +5,7 @@
  cmake,
  pkg-config,
  ispc,
-  tbb,
+  onetbb,
  glfw,
  openimageio,
  libjpeg,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
  cmakeFlags = [
    "-DEMBREE_TUTORIALS=OFF"
    "-DEMBREE_RAY_MASK=ON"
-    "-DTBB_ROOT=${tbb}"
-    "-DTBB_INCLUDE_DIR=${tbb.dev}/include"
+    "-DTBB_ROOT=${onetbb}"
+    "-DTBB_INCLUDE_DIR=${onetbb.dev}/include"
  ];

  nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    cmake
  ];
  buildInputs = [
-    tbb
+    onetbb
    glfw
    openimageio
    libjpeg
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -69,7 +69,7 @@
  tesseract,
  leptonica,
  enableTbb ? false,
-  tbb,
+  onetbb,
  enableOvis ? false,
  ogre,
  enableGPhoto2 ? false,
@@ -406,7 +406,7 @@ effectiveStdenv.mkDerivation {
    leptonica
  ]
  ++ optionals enableTbb [
-    tbb
+    onetbb
  ]
  ++ optionals effectiveStdenv.hostPlatform.isDarwin [
    bzip2
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -69,7 +69,7 @@
  opencascade-occt,

  # threading
-  tbb,
+  onetbb,
  llvmPackages,

  # rendering
@@ -108,7 +108,6 @@ let
      throw ''qtVersion must be "5", "6" or null'';
  vtkPackages = lib.makeScope newScope (self: {
    inherit
-      tbb
      mpi
      mpiSupport
      python3Packages
@@ -205,13 +204,13 @@ stdenv.mkDerivation (finalAttrs: {
    libtheora
    cli11
    openslide
+    onetbb
    vtkPackages.hdf5
    vtkPackages.cgns
    vtkPackages.adios2
    vtkPackages.netcdf
    vtkPackages.catalyst
    vtkPackages.viskores
-    vtkPackages.tbb
  ]
  ++ lib.optionals stdenv.cc.isClang [
    llvmPackages.openmp
--- a/pkgs/development/python-modules/cgal/default.nix
+++ b/pkgs/development/python-modules/cgal/default.nix
@@ -9,7 +9,7 @@
  cgal,
  cmake,
  gmp,
-  tbb,
+  onetbb,
  LAStools,
  eigen,
  mpfr,
@@ -45,7 +45,7 @@ buildPythonPackage rec {
    mpfr
    boost
    zlib
-    tbb
+    onetbb
    eigen
  ]
  ++ lib.optionals withLAS [
--- a/pkgs/development/python-modules/gudhi/default.nix
+++ b/pkgs/development/python-modules/gudhi/default.nix
@@ -9,7 +9,7 @@
  gmp,
  cgal,
  mpfr,
-  tbb,
+  onetbb,
  numpy,
  cython,
  pybind11,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
    cgal
    mpfr
  ]
-  ++ lib.optionals enableTBB [ tbb ];
+  ++ lib.optionals enableTBB [ onetbb ];
  propagatedBuildInputs = [
    numpy
    scipy
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -33,7 +33,7 @@
  python,
  qt6,
  setuptools,
-  tbb,
+  onetbb,
  withDocs ? false,
  withOsl ? true,
  withTools ? false,
@@ -126,7 +126,7 @@ buildPythonPackage rec {
    opencolorio
    openimageio
    ptex
-    tbb
+    onetbb
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    libX11
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -18,7 +18,7 @@
  python3,
  qtbase,
  qttools,
-  tbb,
+  onetbb,
  unshield,
  wrapQtAppsHook,
  xz,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
    minizip
    qtbase
    qttools
-    tbb
+    onetbb
    xz
    zlib
  ];
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -15,7 +15,7 @@
  jq,
  gcc,
  elfutils,
-  tbb,
+  onetbb,
  protobuf,
  grpc,
  yaml-cpp,
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
    openssl
    curl
    jq
-    tbb
+    onetbb
    re2
    protobuf
    grpc