v8: unpin llvmPackages_15.stdenv on darwin

+9 -12
+6 -2
pkgs/development/libraries/v8/default.nix
··· 113 113 --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 114 114 'false' 115 115 ''} 116 - ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' 116 + ${lib.optionalString stdenv.isDarwin '' 117 117 substituteInPlace build/config/compiler/BUILD.gn \ 118 118 --replace "-Wl,-fatal_warnings" "" 119 119 ''} ··· 143 143 ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' 144 144 ++ lib.optional stdenv.isDarwin ''use_lld=false''; 145 145 146 - env.NIX_CFLAGS_COMPILE = "-O2"; 146 + env.NIX_CFLAGS_COMPILE = toString ([ 147 + "-O2" 148 + ] ++ lib.optionals stdenv.cc.isClang [ 149 + "-Wno-error=enum-constexpr-conversion" 150 + ]); 147 151 FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; 148 152 149 153 nativeBuildInputs = [
+3 -10
pkgs/top-level/all-packages.nix
··· 24913 24913 24914 24914 ucommon = callPackage ../development/libraries/ucommon { }; 24915 24915 24916 - v8 = callPackage ../development/libraries/v8 ( 24917 - let 24918 - stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" 24919 - then overrideLibcxx llvmPackages_15.stdenv 24920 - else stdenv; 24921 - in 24922 - { 24923 - stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; 24924 - } 24925 - ); 24916 + v8 = callPackage ../development/libraries/v8 { 24917 + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; 24918 + }; 24926 24919 24927 24920 intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; 24928 24921