Merge pull request #155949 from gbpdt/fix/bazel_runtime_deps

bazel_3, bazel_4: Explicitly add a dependency on bazel-rc
This commit is contained in:
Uri Baghin
2022-02-07 21:44:30 +11:00
committed by GitHub
2 changed files with 8 additions and 0 deletions
@@ -613,6 +613,10 @@ stdenv.mkDerivation rec {
# runtime dependencies.
echo "${python27}" >> $out/nix-support/depends
echo "${python3}" >> $out/nix-support/depends
# The string literal specifying the path to the bazel-rc file is sometimes
# stored non-contiguously in the binary due to gcc optimisations, which leads
# Nix to miss the hash when scanning for dependencies
echo "${bazelRC}" >> $out/nix-support/depends
'' + lib.optionalString stdenv.isDarwin ''
echo "${cctools}" >> $out/nix-support/depends
'';
@@ -660,6 +660,10 @@ stdenv.mkDerivation rec {
postFixup = ''
mkdir -p $out/nix-support
echo "${defaultShellPath}" >> $out/nix-support/depends
# The string literal specifying the path to the bazel-rc file is sometimes
# stored non-contiguously in the binary due to gcc optimisations, which leads
# Nix to miss the hash when scanning for dependencies
echo "${bazelRC}" >> $out/nix-support/depends
'' + lib.optionalString stdenv.isDarwin ''
echo "${cctools}" >> $out/nix-support/depends
'';