cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

v8: unpin llvmPackages_15.stdenv on darwin

Browse source
This commit is contained in:
Weijia Wang 2024-04-20 17:36:14 +02:00
parent d31751f63b
commit ac01eef7b1
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/v8/default.nix
View file

@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
--replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \
'false' 'false'
''} ''}
${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' ${lib.optionalString stdenv.isDarwin ''
substituteInPlace build/config/compiler/BUILD.gn \ substituteInPlace build/config/compiler/BUILD.gn \
--replace "-Wl,-fatal_warnings" "" --replace "-Wl,-fatal_warnings" ""
''} ''}
@ -143,7 +143,11 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"''
++ lib.optional stdenv.isDarwin ''use_lld=false''; ++ lib.optional stdenv.isDarwin ''use_lld=false'';
env.NIX_CFLAGS_COMPILE = "-O2"; env.NIX_CFLAGS_COMPILE = toString ([
"-O2"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-error=enum-constexpr-conversion"
]);
FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12";
nativeBuildInputs = [ nativeBuildInputs = [

13
pkgs/top-level/all-packages.nix
View file

@ -24913,16 +24913,9 @@ with pkgs;
ucommon = callPackage ../development/libraries/ucommon { }; ucommon = callPackage ../development/libraries/ucommon { };
v8 = callPackage ../development/libraries/v8 ( v8 = callPackage ../development/libraries/v8 {
let stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" };
then overrideLibcxx llvmPackages_15.stdenv
else stdenv;
in
{
stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
}
);
intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };