dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bazel-watcher: Ensure fixed output hashes are system independent

Browse Source 
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.
This commit is contained in:
Claudio Bley 2022-07-11 16:26:10 +02:00
parent 8d97e13ef3
commit e7d5889381
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -46,6 +46,7 @@ buildBazelPackage rec {
bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ];
bazelTarget = "//ibazel"; bazelTarget = "//ibazel";
fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system
fetchAttrs = { fetchAttrs = {
inherit patches; inherit patches;
@ -75,9 +76,12 @@ buildBazelPackage rec {
# should be equivalent. # should be equivalent.
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} 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 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 = { buildAttrs = {