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

Remove libtbb derivation as a duplicate.

4 files changed, 15 insertions, 47 deletions

diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix
deleted file mode 100644
index 1422f6c5ceb..00000000000
--- a/pkgs/development/libraries/libtbb/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
-
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 ];
   };
 }
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 73c010d645f..388e5cc3a6c 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -57,7 +57,7 @@ let
     glew110
     openssl
     libidn
-    libtbb
+    tbb
 
     # Other things from runtime
     xlibs.libXinerama
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98bd9178624..eb25d0296c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3121,8 +3121,6 @@ with pkgs;
 
   libsrs2 = callPackage ../development/libraries/libsrs2 { };
 
-  libtbb = callPackage ../development/libraries/libtbb { };
-
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
   libtelnet = callPackage ../development/libraries/libtelnet { };