From c9ac187c3c2c6da622578d9168ab9152c7d457c9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Oct 2017 01:48:47 +0300
Subject: tbb: 4.4-u2 -> 2018_U1, merge with libtbb

Remove libtbb derivation as a duplicate.
---
 pkgs/development/libraries/libtbb/default.nix | 30 ---------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtbb/default.nix

(limited to 'pkgs/development/libraries/libtbb/default.nix')

diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix
deleted file mode 100644
index 1422f6c5ceb9..000000000000
--- 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 ];
-  };
-}
-
-- 
cgit 1.4.1