diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-11 15:53:44 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-11 18:43:00 +0200 |
| commit | d2f30b0b11e66f8064132357892340fd814f8338 (patch) | |
| tree | 52245f0552bad449cdf0d223183f742fb71a61bb /pkgs/development/libraries/tbb/default.nix | |
| parent | 99396a48a5ade1b6349ecb7cb17e8cc278804545 (diff) | |
| download | nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar.gz nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar.bz2 nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar.lz nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar.xz nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.tar.zst nixpkgs-d2f30b0b11e66f8064132357892340fd814f8338.zip | |
pkgsMusl.tbb: fix build
Use patches from openembedded: https://github.com/openembedded/meta-openembedded/tree/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb Also apply the patches unconditionally so that it is obvious when they do not apply any more.
Diffstat (limited to 'pkgs/development/libraries/tbb/default.nix')
| -rw-r--r-- | pkgs/development/libraries/tbb/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 93750621275..af22361f7a2 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , fetchFromGitHub , fixDarwinDylibNames }: @@ -15,8 +16,18 @@ stdenv.mkDerivation rec { sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ - ./glibc-struct-mallinfo.patch + patches = [ + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; + sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + }) + + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; + sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ |