JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tbb: 4.4-u2 -> 2018_U1, merge with libtbb

Browse Source 
Remove libtbb derivation as a duplicate.
This commit is contained in:
Nikolay Amiantov 2017-10-29 01:48:47 +03:00
parent b676aa045f
commit c9ac187c3c
4 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/libraries/libtbb/default.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchFromGitHub, tree }:
stdenv.mkDerivation rec {
name = "libtbb-${version}";
version = "2018_U1";
src = fetchFromGitHub {
owner = "01org";
repo = "tbb";
rev = "${version}";
sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
};
buildInputs = [ tree ];
installPhase = ''
mkdir -p "$out"/usr/include "$out"/lib
install -m755 build/linux_*/*.so* "$out"/lib/
cp -a include/tbb "$out"/usr/include/
'';
meta = with stdenv.lib; {
homepage = "https://www.threadingbuildingblocks.org/";
description = "High level abstract threading library";
platforms = platforms.unix;
license = licenses.asl20;
maintainers = with maintainers; [ dizfer ];
};
}

28
pkgs/development/libraries/tbb/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "tbb-4.4-u2"; name = "tbb-${version}";
version = "2018_U1";
src = fetchurl { src = fetchFromGitHub {
url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; owner = "01org";
sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; repo = "tbb";
rev = version;
sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
}; };
checkTarget = "test";
doCheck = false;
installPhase = '' installPhase = ''
mkdir -p $out/{lib,share/doc} mkdir -p $out/{lib,share/doc}
cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
@ -21,10 +21,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "Intel Thread Building Blocks C++ Library"; description = "Intel Thread Building Blocks C++ Library";
homepage = http://threadingbuildingblocks.org/; homepage = "http://threadingbuildingblocks.org/";
license = stdenv.lib.licenses.lgpl3Plus; license = licenses.asl20;
longDescription = '' longDescription = ''
Intel Threading Building Blocks offers a rich and complete approach to Intel Threading Building Blocks offers a rich and complete approach to
expressing parallelism in a C++ program. It is a library that helps you expressing parallelism in a C++ program. It is a library that helps you
@ -33,7 +33,7 @@ stdenv.mkDerivation {
represents a higher-level, task-based parallelism that abstracts platform represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance. details and threading mechanisms for scalability and performance.
''; '';
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; maintainers = with maintainers; [ peti thoughtpolice dizfer ];
}; };
} }

2
pkgs/games/steam/runtime-wrapped.nix
View File

@ -57,7 +57,7 @@ let
glew110 glew110
openssl openssl
libidn libidn
libtbb tbb
# Other things from runtime # Other things from runtime
xlibs.libXinerama xlibs.libXinerama

2
pkgs/top-level/all-packages.nix
View File

@ -3121,8 +3121,6 @@ with pkgs;
libsrs2 = callPackage ../development/libraries/libsrs2 { }; libsrs2 = callPackage ../development/libraries/libsrs2 { };
libtbb = callPackage ../development/libraries/libtbb { };
libtermkey = callPackage ../development/libraries/libtermkey { }; libtermkey = callPackage ../development/libraries/libtermkey { };
libtelnet = callPackage ../development/libraries/libtelnet { }; libtelnet = callPackage ../development/libraries/libtelnet { };