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 From 34387bcf5bc41042b3b08fadafd009d37aac2e5f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 26 Jun 2019 15:23:50 +0200 Subject: buildBazelPackage: fix preConfigure without dependencies --- pkgs/build-support/build-bazel-package/default.nix | 4 ++-- 1 file changed, 2 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 c0ad4a6a38ec..7c9fc83e0f1b 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -88,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" -- cgit 1.4.1 From 4e5b10d98c98a3c1baee664c37896057ee12e7c0 Mon Sep 17 00:00:00 2001 From: Erik Nygren Date: Sat, 29 Jun 2019 16:50:02 +0200 Subject: trivial-builders: Fix writeShellScript example (#63888) --- pkgs/build-support/trivial-builders.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/build-support') 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//my-file and makes executable. + * # Writes my-file to /nix/store/ and makes executable. * writeShellScript "my-file" * '' * Contents of File -- cgit 1.4.1