From c691e088d79dc154b15568b6dbaece1c1aa473e3 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 24 Nov 2021 10:55:14 -0800 Subject: [PATCH] bazel_4: Fix Bazel-built protoc segfault on macOS Monterey (#147097) This was fixed by enabling the user_link_flags_feature for macosx cc_toolchain_config. References: - https://github.com/bazelbuild/bazel/issues/14216 - https://github.com/bazelbuild/bazel/pull/14275 --- .../tools/build-managers/bazel/bazel_4/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 0e021d05ac37..3dd40ad1f8a4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self @@ -214,6 +214,14 @@ stdenv.mkDerivation rec { src = ../bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) + + # On macOS Monterey, protoc segfaults. + # Issue: https://github.com/bazelbuild/bazel/issues/14216 + # Fix: https://github.com/bazelbuild/bazel/pull/14275 + (fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch"; + sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE="; + }) ] ++ lib.optional enableNixHacks ../nix-hacks.patch;