Unverified Commit 10a29bad authored by Emily's avatar Emily Committed by GitHub
Browse files

tbb_2022: 2022.1.0 -> 2022.2.0, clean up, fix macOS; tbb_2021: drop (#442554)

parents 25c1d672 1e05afe6

pkgs/applications/misc/prusa-slicer/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
  opencascade-occt_7_6_1,

  openvdb,

  qhull,

  tbb_2021,

  tbb_2022,

  wxGTK32,

  xorg,

  libbgcode,
@@ -54,7 +54,7 @@ let 
      hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";

    };

  });

  openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };

  openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };

  wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;

  opencascade-override' =

    if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
@@ -122,9 +122,9 @@ stdenv.mkDerivation (finalAttrs: { 
    nanosvg-fltk

    nlopt

    opencascade-override'

    openvdb_tbb_2021_8

    openvdb_tbb_2022

    qhull

    tbb_2021

    tbb_2022

    wxGTK-override'

    xorg.libX11

    libbgcode

pkgs/by-name/au/autotier/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  boost,

  fuse3,

  lib45d,

  tbb_2021,

  tbb_2022,

  liburing,

  installShellFiles,

}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
    boost

    fuse3

    lib45d

    tbb_2021

    tbb_2022

    liburing

  ];

pkgs/by-name/ba/bambu-studio/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
  opencv,

  pcre,

  systemd,

  tbb_2021,

  tbb_2022,

  webkitgtk_4_1,

  wxGTK31,

  xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { 
    opencascade-occt_7_6

    openvdb

    pcre

    tbb_2021

    tbb_2022

    webkitgtk_4_1

    wxGTK'

    xorg.libX11

pkgs/by-name/bl/blender/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ stdenv'.mkDerivation (finalAttrs: { 
    libsndfile

    libtiff

    libwebp

    (manifold.override { tbb_2021 = tbb; })

    manifold

    opencolorio

    openexr

    openimageio

pkgs/by-name/ca/cabinpkg/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  tbb_2021,

  tbb_2022,

  libgit2,

  curl,

  fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    libgit2

    fmt

    tbb_2021

    tbb_2022

    nlohmann_json

    curl

  ];