diff options
| -rw-r--r-- | pkgs/development/compilers/llvm/17/libcxx/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/17/libcxxabi/default.nix | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/17/libcxx/default.nix b/pkgs/development/compilers/llvm/17/libcxx/default.nix index 8a5272ea07af..8f4b0cec8d40 100644 --- a/pkgs/development/compilers/llvm/17/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/17/libcxx/default.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation rec { hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; relative = "libcxx"; }) + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + # https://github.com/llvm/llvm-project/issues/64226 + (fetchpatch { + name = "0042-mbstate_t-not-defined.patch"; + url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch"; + relative = "libcxx"; + hash = "sha256-fVbX99W1gQrSaMFeBkzsJmNWNy0xVSw+oFvDe4AYXL0="; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/17/libcxxabi/default.nix b/pkgs/development/compilers/llvm/17/libcxxabi/default.nix index 0a795da44ae4..30ca99b20fd7 100644 --- a/pkgs/development/compilers/llvm/17/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/17/libcxxabi/default.nix @@ -110,8 +110,5 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - # Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved - # We should check if the version is not 10.13 but that is currently broken. - broken = stdenv.isDarwin && stdenv.isx86_64; }; } |