diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/development/libraries/tbb | |
parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tbb')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/tbb/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index d8a74bdf591d..615ac4fa690c 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U5"; + version = "2019_U5"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp"; + sha256 = "0390da1iya2mvn3ribjb1f8yvzsqsf5b16wn6dqbjxcz0crmwlzk"; }; makeFlags = concatStringsSep " " ( @@ -19,11 +19,10 @@ with stdenv.lib; stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' - mkdir -p $out/{lib,share/doc} + mkdir -p $out/lib cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html - mv doc/html $out/share/doc/tbb ''; enableParallelBuilding = true; |