nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-21 20:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282727 from wegank/llvm-17-darwin-2

Browse Source 
llvmPackages_17: unbreak on x86_64-darwin
This commit is contained in:
a-n-n-a-l-e-e 2024-02-05 10:41:03 -08:00 committed by GitHub
commit 1fbf11b24f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/llvm/17/libcxx/default.nix
View File

@ -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 = ''

3
pkgs/development/compilers/llvm/17/libcxxabi/default.nix
View File

@ -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;
};
}