diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-08 06:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-08 06:00:58 +0000 |
commit | d987b47512b9db3928ce45b2bc7f43db860cd944 (patch) | |
tree | 2d9a63753f42b06b0643a9b553dfb7bbb6a1fa45 /pkgs/development/compilers/llvm/15/libcxx/default.nix | |
parent | 542aa87231d98d70caeb56bef05028ecdc48a388 (diff) | |
parent | d442dbe4872e60e04b6084ac68eb2f0969cc25f7 (diff) | |
download | nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.gz nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.bz2 nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.lz nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.xz nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.zst nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/15/libcxx/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/15/libcxx/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index cc4e9bc83058..ed5f48e8c38f 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind @@ -47,6 +47,15 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + # See: + # - https://reviews.llvm.org/D133566 + # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 + # !!! Drop in LLVM 16+ + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; + hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k="; + relative = "libcxx"; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; |