Unverified Commit b96918e5 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #305575 from wegank/v8-stdenv 

v8: unpin llvmPackages_15.stdenv on darwin
parents 8472357d ac01eef7

pkgs/development/libraries/v8/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec { 
        --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

                  'false'

    ''}

    ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''

    ${lib.optionalString stdenv.isDarwin ''

      substituteInPlace build/config/compiler/BUILD.gn \

        --replace "-Wl,-fatal_warnings" ""

    ''}
@@ -143,7 +143,11 @@ stdenv.mkDerivation rec { 
  ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"''

  ++ 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";



  nativeBuildInputs = [

pkgs/top-level/all-packages.nix

+3 −10
Original line number Diff line number Diff line
@@ -24913,16 +24913,9 @@ with pkgs; 














  ucommon = callPackage ../development/libraries/ucommon { };



























  v8 = callPackage ../development/libraries/v8 (













    let













      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';













    }













  );













  v8 = callPackage ../development/libraries/v8 {













    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;













  };





























  intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };