From 255686e8fc327e9a56cbdb27f6d65f180cb168a8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 26 Jun 2019 15:15:38 +0200 Subject: bzildBazelPackage: fix fetch with no markers Previously the installPhase of the fixed ouput derivation would fail for a package that has no markers, since `sed` would complain about having no input files. If we use `find` instead of bash globs, that problem goes away. --- pkgs/build-support/build-bazel-package/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 1004a7ce3f92..c0ad4a6a38ec 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -51,8 +51,10 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{local_*,\@local_*} # Patching markers to make them deterministic - sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker - sed -i '/^ENV:TMP.*/d' $bazelOut/external/\@*.marker + find $bazelOut/external -name '@*\.marker' -exec sed -i \ + -e 's, -\?[0-9][0-9]*$, 1,' \ + -e '/^ENV:TMP.*/d' \ + '{}' \; # Remove all vcs files rm -rf $(find $bazelOut/external -type d -name .git) -- cgit 1.4.1