Merge pull request #243540 from reckenrode/adv_cmds-clang2

This commit is contained in:
Artturi 2023-08-01 07:29:25 +03:00 committed by GitHub
commit f42617f5b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,17 @@
{ lib, appleDerivation, xcbuild, ncurses, libutil, Libc }:
{ stdenv, lib, appleDerivation, xcbuild, ncurses, libutil, Libc }:
let
# Libc conflicts with libc++ 16, so provide only the header from it thats needed to build.
msgcat = stdenv.mkDerivation {
pname = "Libc-msgcat";
version = lib.getVersion Libc;
buildCommand = ''
mkdir -p "$out/include"
ln -s ${lib.getDev Libc}/include/msgcat.h "$out/include/"
'';
};
in
appleDerivation {
# We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
@ -44,7 +56,7 @@ appleDerivation {
'';
nativeBuildInputs = [ xcbuild ];
buildInputs = [ ncurses libutil Libc ];
buildInputs = [ ncurses libutil msgcat ];
meta = {
platforms = lib.platforms.darwin;