lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p/nixpkgs: fix buildBazelPackage

Browse source
This commit is contained in:
Luke Granger-Brown 2021-02-07 22:51:09 +00:00
parent 2ce322a6dc
commit efdf61b4e6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/copybara.nix
View file

@ -20,7 +20,7 @@ pkgs.buildBazelPackage rec {
];
fetchAttrs = {
sha256 = "0id7y01fqc6br28ccayx2z3nz75kf5gvgzh0k8701vp4g6dgd5ym";
sha256 = "sha256:195av0bvgqgs7wwzx14yrrww582ijadvjdx82hx4911lp4jlbg8d";
preHook = ''
export COURSIER_CACHE="$(echo ''${NIX_BUILD_TOP}/tmp/coursier | sed -e 's,//,/,g')"
'';

2
third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix vendored
View file

@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
name="$(basename "$symlink")"
rm "$symlink"
test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker"
test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || exit 0
done
# Patching symlinks to remove build directory reference