diff options
author | joachifm <joachifm@users.noreply.github.com> | 2016-04-11 23:15:31 +0200 |
---|---|---|
committer | joachifm <joachifm@users.noreply.github.com> | 2016-04-11 23:15:31 +0200 |
commit | b70f9dc17287d195039aa77f9d4bae83821511d2 (patch) | |
tree | 77b7a204111ea98b20fa1a05914d7a5f713c801c /pkgs | |
parent | a2aec04abcd0887f073355b7cb63641fa4b42a51 (diff) | |
parent | 79b76d59b5581bc18ac63a6723a1d0876349ddc3 (diff) | |
download | nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar.gz nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar.bz2 nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar.lz nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar.xz nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.tar.zst nixlib-b70f9dc17287d195039aa77f9d4bae83821511d2.zip |
Merge pull request #14353 from acowley/tbb
tbb: darwin compatibility
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/tbb/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 58e5d0864d3f..31fc5401e754 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl }: +let + SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; +in stdenv.mkDerivation { name = "tbb-4.4-u2"; @@ -13,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/{lib,share/doc} - cp "build/"*release*"/"*so* $out/lib/ + cp "build/"*release*"/"*${SHLIB_EXT}* $out/lib/ mv include $out/ rm $out/include/index.html mv doc/html $out/share/doc/tbb @@ -33,7 +36,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform 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 ]; }; } |