nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147284 from NixOS/backport-147097-to-release-21.11

Browse Source 
[Backport release-21.11] bazel_4: Fix Bazel-built protoc segfault on macOS Monterey
This commit is contained in:
Wael Nasreddine
2021-11-25 08:51:36 -08:00
committed by GitHub
parent 49a965f08d b16d2ce858
commit f0c8f37376
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View File

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