Commit 751dc954 authored by Saterfield990's avatar Saterfield990
Browse files

tbb_2020: shorten name; move to by-name

parent 3b69db03

pkgs/development/libraries/tbb/2020_3.nix→pkgs/by-name/tb/tbb_2020/package.nix

+24 −26
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  fixDarwinDylibNames,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "tbb";

  version = "2020.3";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "oneapi-src";

    repo = "oneTBB";

    rev = "v${version}";

    sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";

  };



  patches = [
@@ -91,29 +91,27 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  postInstall =

    let

  pcTemplate = fetchurl {

    url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in";

        sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";

    hash = "sha256-2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";

  };

    in

    ''



  postInstall = ''

    # Generate pkg-config file based on upstream template.

    # It should not be necessary with tbb after 2021.2.

    mkdir -p "$out/lib/pkgconfig"

      substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \

    substitute "${finalAttrs.pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \

    --subst-var-by CMAKE_INSTALL_PREFIX "$out" \

    --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \

    --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \

        --subst-var-by TBB_VERSION "${version}" \

    --subst-var-by TBB_VERSION "${finalAttrs.version}" \

    --subst-var-by TBB_LIB_NAME "tbb"

  '';



  meta = with lib; {

  meta = {

    description = "Intel Thread Building Blocks C++ Library";

    homepage = "http://threadingbuildingblocks.org/";

    license = licenses.asl20;

    license = lib.licenses.asl20;

    longDescription = ''

      Intel Threading Building Blocks offers a rich and complete approach to

      expressing parallelism in a C++ program. It is a library that helps you
@@ -122,11 +120,11 @@ stdenv.mkDerivation rec { 
      represents a higher-level, task-based parallelism that abstracts platform

      details and threading mechanisms for scalability and performance.

    '';

    platforms = platforms.unix;

    maintainers = with maintainers; [

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [

      silvanshade

      thoughtpolice

      tmarkus

    ];

  };

}
 
})

pkgs/development/libraries/embree/2.x.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  cmake,

  pkg-config,

  ispc,

  tbb_2020_3,

  tbb_2020,

  glfw,

  openimageio_2,

  libjpeg,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    ispc

    # tbb_2021 is not backward compatible

    tbb_2020_3

    tbb_2020

    glfw

    openimageio_2

    libjpeg
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { 
        "v(2.*)"

      ];

    };

    tbb = tbb_2020_3;

    tbb = tbb_2020;

    tests = {

      inherit (python3Packages) embreex;

    };

pkgs/top-level/all-packages.nix

+1 −2
Original line number Diff line number Diff line
@@ -6100,9 +6100,8 @@ with pkgs; 














  swi-prolog-gui = swi-prolog.override { withGui = true; };



























  tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };















  # many packages still fail with latest version













  tbb = tbb_2020_3;













  tbb = tbb_2020;





























  teyjus = callPackage ../development/compilers/teyjus {















    inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;