diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 08:59:42 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 08:59:42 +0200 |
| commit | 25a77b72106922b055d1e1f1883c164d34b17311 (patch) | |
| tree | c7c981528854fc55a9aed6a2445f4e8172ea9ea0 /pkgs/build-support | |
| parent | d41bc0ff569f199517becf0ca4da87f8e29b1254 (diff) | |
| parent | 3ad01beda76c038e52e8f4524d5f3c409e0b6e36 (diff) | |
| download | nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar.gz nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar.bz2 nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar.lz nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar.xz nixlib-25a77b72106922b055d1e1f1883c164d34b17311.tar.zst nixlib-25a77b72106922b055d1e1f1883c164d34b17311.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 |
2 files changed, 7 insertions, 5 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" diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index b66c1d9e4d15..5706a98f6008 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -143,7 +143,7 @@ rec { * Automatically includes interpreter above the contents passed. * * Example: - * # Writes my-file to /nix/store/<store path>/my-file and makes executable. + * # Writes my-file to /nix/store/<store path> and makes executable. * writeShellScript "my-file" * '' * Contents of File |