From f2b94e3da03d6c01220c191289b7f37ab5615624 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 14 Sep 2025 16:48:07 +0100 Subject: [PATCH] treewide: tbb -> onetbb --- pkgs/applications/graphics/pymeshlab/default.nix | 4 ++-- pkgs/build-support/appimage/default.nix | 2 +- pkgs/by-name/ad/adaptivecpp/tests.nix | 4 ++-- pkgs/by-name/bo/bowtie2/package.nix | 4 ++-- pkgs/by-name/br/brickstore/package.nix | 4 ++-- pkgs/by-name/cl/cloudcompare/package.nix | 4 ++-- .../co/cortex-command-community-project/package.nix | 4 ++-- pkgs/by-name/cu/curv/package.nix | 4 ++-- pkgs/by-name/ea/easyeffects/package.nix | 4 ++-- pkgs/by-name/el/elmerfem/package.nix | 4 ++-- pkgs/by-name/en/envision/package.nix | 2 +- pkgs/by-name/f3/f3d/package.nix | 4 ++-- pkgs/by-name/ho/houdini/package.nix | 2 +- pkgs/by-name/is/ispc/package.nix | 4 ++-- pkgs/by-name/me/meshlab-unstable/package.nix | 4 ++-- pkgs/by-name/me/meshlab/package.nix | 4 ++-- pkgs/by-name/mi/mirtk/package.nix | 4 ++-- pkgs/by-name/op/openimagedenoise/package.nix | 8 ++++---- pkgs/by-name/op/openpgl/package.nix | 6 +++--- pkgs/by-name/op/openturns/package.nix | 4 ++-- pkgs/by-name/op/openvdb/package.nix | 4 ++-- pkgs/by-name/pa/pagmo2/package.nix | 4 ++-- pkgs/by-name/po/potreeconverter/package.nix | 4 ++-- pkgs/by-name/tr/tracy/package.nix | 4 ++-- pkgs/by-name/vi/viskores/package.nix | 4 ++-- pkgs/by-name/we/webex/package.nix | 4 ++-- pkgs/development/libraries/embree/default.nix | 8 ++++---- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- pkgs/development/libraries/vtk/generic.nix | 5 ++--- pkgs/development/python-modules/cgal/default.nix | 4 ++-- pkgs/development/python-modules/gudhi/default.nix | 4 ++-- pkgs/development/python-modules/openusd/default.nix | 4 ++-- pkgs/games/vcmi/default.nix | 4 ++-- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 34 files changed, 70 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix index a44d4c4f5bee..b6d37dfc5649 100644 --- 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 diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index de2b46050b72..11de395dc1a0 100644 --- 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 diff --git a/pkgs/by-name/ad/adaptivecpp/tests.nix b/pkgs/by-name/ad/adaptivecpp/tests.nix index 7ce1149ff6b7..68a2d41b58ab 100644 --- 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 ]; diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix index adc49a98e353..5286edb36f81 100644 --- 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 diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix index 44ba98dd143a..f3d36b7f2b54 100644 --- 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 = [ diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index b2079b16ad36..496b0e7a761e 100644 --- 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 ]; diff --git a/pkgs/by-name/co/cortex-command-community-project/package.nix b/pkgs/by-name/co/cortex-command-community-project/package.nix index ec2f85a455bf..80198390624b 100644 --- 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 { }; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 2d68ac3aeef0..2859522af3d2 100644 --- 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 diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index b3d361149720..9b1bf57d2051 100644 --- 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 ]; diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index aacf40f49afa..2035b2ac5b3c 100644 --- 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; diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 60361501033d..17f6e2274edb 100644 --- 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 diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix index b24c155673d9..f79b09b643c7 100644 --- 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 = [ diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index a0e7c9a723b3..0efde5272233 100644 --- 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 diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index 7a5045ad356b..21480aae4f56 100644 --- 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; [ diff --git a/pkgs/by-name/me/meshlab-unstable/package.nix b/pkgs/by-name/me/meshlab-unstable/package.nix index 23ea4b2c63c9..8802c34c3c0b 100644 --- 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 diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index c78afc438302..260c74764d56 100644 --- 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 diff --git a/pkgs/by-name/mi/mirtk/package.nix b/pkgs/by-name/mi/mirtk/package.nix index 47b27b5b960e..04710e107ec5 100644 --- 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 ]; diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index f666529ede71..193f518bf497 100644 --- 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 = { diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix index 4dde88f62eab..e0f1a6561a44 100644 --- 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 ( diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index b0a96fd5f650..347232c44f90 100644 --- 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 diff --git a/pkgs/by-name/op/openvdb/package.nix b/pkgs/by-name/op/openvdb/package.nix index 68e58f3d4990..14f9a8a11fc1 100644 --- 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 diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix index 0d214f558843..8d603f38bf5d 100644 --- 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; diff --git a/pkgs/by-name/po/potreeconverter/package.nix b/pkgs/by-name/po/potreeconverter/package.nix index 467011890037..240df12965be 100644 --- 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 = [ diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 93c962e8fad0..8277793d3b25 100644 --- 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 ] diff --git a/pkgs/by-name/vi/viskores/package.nix b/pkgs/by-name/vi/viskores/package.nix index 5f6e601e27bc..76f248506fc3 100644 --- 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; diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 49b114da935c..1633cb8018d3 100644 --- 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 ]; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 140a0d82e4bc..eb4519e13742 100644 --- 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 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 574c77f51644..26a49c1ae1af 100644 --- 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 diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 47baf2aa718b..7b7ac7387c84 100644 --- 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 diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix index 46251662a624..0cc475f09212 100644 --- 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 [ diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 124b2660c5b9..5b83f1d83ef2 100644 --- 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 diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 32937c89d3ed..0354d1c923a6 100644 --- 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 diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index c8bdfc4f51f9..88b26e0a1175 100644 --- 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 ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index c680e7d7aeae..b8d952e0dc00 100644 --- 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