diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-07-02 11:19:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 11:19:20 +0200 |
| commit | 63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d (patch) | |
| tree | 2a008268e89be72c8a6df9a4e5b59b36414c78a0 /pkgs/build-support | |
| parent | 84708a80131685587361459795c605fb5781f911 (diff) | |
| parent | 79c5510f521f3f7eada826a7b13967bb3e67d381 (diff) | |
| download | nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar.gz nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar.bz2 nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar.lz nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar.xz nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.tar.zst nixlib-63e15d588a2b0a280b04ee14b65ef3b8e7a92c2d.zip | |
Merge pull request #63809 from timokau/dm-sonnet-1.33
python.pkgs.dm-sonnet: 1.30 -> 1.33
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 1004a7ce3f92..7c9fc83e0f1b 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) @@ -86,8 +88,8 @@ in stdenv.mkDerivation (fBuildAttrs // { ''; preConfigure = '' - mkdir -p $bazelOut/external - cp -r $deps/* $bazelOut/external + mkdir -p "$bazelOut" + cp -r $deps $bazelOut/external chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" |