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

Merge pull request #14353 from acowley/tbb 

tbb: darwin compatibility
This commit is contained in:
joachifm 2016-04-11 23:15:31 +02:00
parent a2aec04abc 79b76d59b5
commit b70f9dc172
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let
SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tbb-4.4-u2"; name = "tbb-4.4-u2";
@ -13,7 +16,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out/{lib,share/doc} mkdir -p $out/{lib,share/doc}
cp "build/"*release*"/"*so* $out/lib/ cp "build/"*release*"/"*${SHLIB_EXT}* $out/lib/
mv include $out/ mv include $out/
rm $out/include/index.html rm $out/include/index.html
mv doc/html $out/share/doc/tbb mv doc/html $out/share/doc/tbb
@ -33,7 +36,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 = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ];
}; };
} }