From bccdc6751f9cbb7817721059757b560e0dfa3ae7 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 22 Dec 2023 16:49:51 +0100 Subject: [PATCH] bazel_6: Skip building the execlog parser on darwin This currently fails with: ``` > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/uncompr.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root. > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/zutil.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root. > Target //src/tools/execlog:parser_deploy.jar failed to build ``` --- .../tools/build-managers/bazel/bazel_6/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 7de1ee8e072f..f8e68deb99f4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -593,7 +593,10 @@ stdenv.mkDerivation rec { ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ --bazel=./bazel_src/output/bazel \ --output=./bazel_src/output/bazel-complete.fish - + '' + + # disable execlog parser on darwin, since it fails to build + # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 + lib.optionalString (!stdenv.isDarwin) '' # need to change directory for bazel to find the workspace cd ./bazel_src # build execlog tooling @@ -617,6 +620,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + '' + + # disable execlog parser on darwin, since it fails to build + # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 + (lib.optionalString (!stdenv.isDarwin) '' mkdir $out/share cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar cat < $out/bin/bazel-execlog @@ -624,7 +631,7 @@ stdenv.mkDerivation rec { ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ EOF chmod +x $out/bin/bazel-execlog - + '') + '' # shell completion files installShellCompletion --bash \ --name bazel.bash \