diff options
| author | Stanisław Pitucha <git@viraptor.info> | 2022-09-01 14:55:06 +1000 |
|---|---|---|
| committer | Stanisław Pitucha <stan.pitucha@envato.com> | 2022-09-10 23:52:16 +1000 |
| commit | 099df1f9acb776b45f91570a3d7de642aacd7993 (patch) | |
| tree | d19f5c82c29d1572a8b9da6dd64deb8e8fee5eb2 /pkgs/development/libraries/v8 | |
| parent | cc9c837aa23a08b18bdda489dbe9728c5aa88466 (diff) | |
v8: fix darwin build
Diffstat (limited to 'pkgs/development/libraries/v8')
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index cf9d597edc21c..c3f04eae4ddfb 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -2,6 +2,8 @@ , gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch +, llvmPackages +, symlinkJoin }: # Use update.sh to update all checksums. @@ -106,6 +108,8 @@ stdenv.mkDerivation rec { touch build/config/gclient_args.gni ''; + llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; }; + gnFlags = [ "use_custom_libcxx=false" "is_clang=${lib.boolToString stdenv.cc.isClang}" @@ -123,7 +127,8 @@ stdenv.mkDerivation rec { # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' - ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' + ++ lib.optional stdenv.isDarwin ''use_lld=false''; NIX_CFLAGS_COMPILE = "-O2"; FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; @@ -135,7 +140,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild - darwin.DarwinTools + llvmPackages.llvm python3.pkgs.setuptools ]; buildInputs = [ glib icu ]; @@ -166,7 +171,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; - # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076 - broken = stdenv.isDarwin; }; } |