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

Merge pull request #97238 from hannesweisbach/macos-tbb

Browse Source 
tbb: fix library install name on macOS
This commit is contained in:
Daniël de Kok 2020-09-06 18:04:08 +02:00 committed by GitHub
commit 2dd41576fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: { stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
with stdenv.lib; stdenv.mkDerivation rec { with stdenv.lib; stdenv.mkDerivation rec {
pname = "tbb"; pname = "tbb";
@ -11,6 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec {
sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"; sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj";
}; };
nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;
makeFlags = optional (compiler != null) "compiler=${compiler}" makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}"; ++ optional (stdver != null) "stdver=${stdver}";