diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-10-29 01:48:47 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-29 01:51:11 +0300 |
commit | c9ac187c3c2c6da622578d9168ab9152c7d457c9 (patch) | |
tree | 5573ed9433fabe0eb83b758607deefaa2d9f7269 /pkgs/development/libraries/tbb | |
parent | b676aa045fc446e9fd49749ef6c3de68401db02b (diff) | |
download | nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar.gz nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar.bz2 nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar.lz nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar.xz nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.tar.zst nixpkgs-c9ac187c3c2c6da622578d9168ab9152c7d457c9.zip |
tbb: 4.4-u2 -> 2018_U1, merge with libtbb
Remove libtbb derivation as a duplicate.
Diffstat (limited to 'pkgs/development/libraries/tbb')
-rw-r--r-- | pkgs/development/libraries/tbb/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index a8a0d5dc2b3..b8aedd46096 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "tbb-4.4-u2"; +stdenv.mkDerivation rec { + name = "tbb-${version}"; + version = "2018_U1"; - src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; - sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = version; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; - checkTarget = "test"; - doCheck = false; - installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ @@ -21,10 +21,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel Thread Building Blocks C++ Library"; - homepage = http://threadingbuildingblocks.org/; - license = stdenv.lib.licenses.lgpl3Plus; + homepage = "http://threadingbuildingblocks.org/"; + license = 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 @@ -33,7 +33,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peti thoughtpolice dizfer ]; }; } |