Commit f5280440 authored by Saterfield990's avatar Saterfield990
Browse files

tbb_2021: shorten name; move to by-name

parent bfb2d9a9

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

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

  openvdb,

  qhull,

  tbb_2021_11,

  tbb_2021,

  wxGTK32,

  xorg,

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

    };

  });

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

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

  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;
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { 
      opencascade-override'

      openvdb_tbb_2021_8

      qhull

      tbb_2021_11

      tbb_2021

      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_11,

  tbb_2021,

  liburing,

  installShellFiles,

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

    fuse3

    lib45d

    tbb_2021_11

    tbb_2021

    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_11,

  tbb_2021,

  webkitgtk_4_0,

  wxGTK31,

  xorg,
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec { 
      opencascade-occt_7_6

      openvdb

      pcre

      tbb_2021_11

      tbb_2021

      webkitgtk_4_0

      wxGTK'

      xorg.libX11

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_11,

  tbb_2021,

  libgit2,

  curl,

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

    libgit2

    fmt

    tbb_2021_11

    tbb_2021

    nlohmann_json

    curl

  ];

pkgs/by-name/li/libblake3/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  cmake,

  fetchFromGitHub,

  fetchpatch,

  tbb_2021_11,

  tbb_2021,



  useTBB ? true,

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


  propagatedBuildInputs = lib.optionals useTBB [

    # 2022.0 crashes on macOS at the moment

    tbb_2021_11

    tbb_2021

  ];



  cmakeFlags = [