@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchgit, fetchFromGitHub
2−, gn, ninja, python, glib, pkg-config, icu
2+, gn, ninja, python, pythonPackages, glib, pkg-config, icu
33, xcbuild, darwin
44, fetchpatch
55}:
@@ -55,6 +55,11 @@ stdenv.mkDerivation rec {
5555 doCheck = true;
5656
5757 patches = [
58+ # Remove unrecognized clang debug flags
59+ (fetchpatch {
60+ url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch";
61+ sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1";
62+ })
5863 ./darwin.patch
5964 ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149
6065 ];
@@ -78,6 +83,13 @@ stdenv.mkDerivation rec {
7883 postPatch = lib.optionalString stdenv.isAarch64 ''
7984 substituteInPlace build/toolchain/linux/BUILD.gn \
8085 --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
86+ '' + lib.optionalString stdenv.isDarwin ''
87+ substituteInPlace build/config/compiler/compiler.gni \
88+ --replace 'strip_absolute_paths_from_debug_symbols = true' \
89+ 'strip_absolute_paths_from_debug_symbols = false'
90+ substituteInPlace build/config/compiler/BUILD.gn \
91+ --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \
92+ 'false'
8193 '';
8294
8395 gnFlags = [
@@ -85,6 +97,7 @@ stdenv.mkDerivation rec {
8597 "is_clang=${lib.boolToString stdenv.cc.isClang}"
8698 "use_sysroot=false"
8799 # "use_system_icu=true"
100+ "clang_use_chrome_plugins=false"
88101 "is_component_build=false"
89102 "v8_use_external_startup_data=false"
90103 "v8_monolithic=true"
@@ -93,16 +106,25 @@ stdenv.mkDerivation rec {
93106 "treat_warnings_as_errors=false"
94107 "v8_enable_i18n_support=true"
95108 "use_gold=false"
96− "use_system_xcode=true"
109+ "init_stack_vars=false"
97110 # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
98111 ''host_toolchain="//build/toolchain/linux/unbundle:default"''
99112 ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
100113 ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
101114
102115 NIX_CFLAGS_COMPILE = "-O2";
103−
104− nativeBuildInputs = [ gn ninja pkg-config python ]
105− ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
116+ FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
117+
118+ nativeBuildInputs = [
119+ gn
120+ ninja
121+ pkg-config
122+ python
123+ ] ++ lib.optionals stdenv.isDarwin [
124+ xcbuild
125+ darwin.DarwinTools
126+ pythonPackages.setuptools
127+ ];
106128 buildInputs = [ glib icu ];
107129
108130 ninjaFlags = [ ":d8" "v8_monolith" ];