From e7d5889381bb5a9d9ffc24b7c772b34fad635efa Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Jul 2022 16:26:10 +0200 Subject: [PATCH] bazel-watcher: Ensure fixed output hashes are system independent bazel-watcher uses different libraries depending on the system now which results in different fixed output hashes for the dependencies. That's why we set `fetchConfigured = false`. Also remove the `external/com_google_protobuf` deps output directory since it contained symlinks to files with different permissions on Linux and Darwin. --- pkgs/development/tools/bazel-watcher/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 708de63b858e..1391debf4ef5 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -46,6 +46,7 @@ buildBazelPackage rec { bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; bazelTarget = "//ibazel"; + fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system fetchAttrs = { inherit patches; @@ -75,9 +76,12 @@ buildBazelPackage rec { # should be equivalent. rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker + + # remove com_google_protobuf because it had files with different permissions on linux and darwin + rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-Tkmq5/vrakWeIsnTQ9o0h2XhT/Ot+r6LRSCE5c6PSEk="; + sha256 = "sha256-QjMsWTIHCy6Mbbphk5eK2wIiw900AvmyA0ZV9Be7nPI="; }; buildAttrs = {