about summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm
diff options
context:
space:
mode:
authora-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2024-02-05 10:41:03 -0800
committerGitHub <noreply@github.com>2024-02-05 10:41:03 -0800
commit1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d (patch)
tree0fb81548e2dca4180b5ec6ef8354a879df52412c /pkgs/development/compilers/llvm
parent2abdba79e4bfc81eceea5cb1dfd21673370a3872 (diff)
parentc086ed06132477ef6089a2f41eb1f1c97b22ce02 (diff)
downloadnixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar.gz
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar.bz2
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar.lz
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar.xz
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.tar.zst
nixlib-1fbf11b24fa2042d3b4dd5391bd9dcd90fdb2d9d.zip
Merge pull request #282727 from wegank/llvm-17-darwin-2
llvmPackages_17: unbreak on x86_64-darwin
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r--pkgs/development/compilers/llvm/17/libcxx/default.nix8
-rw-r--r--pkgs/development/compilers/llvm/17/libcxxabi/default.nix3
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;
   };
 }