third_party/nixpkgs: remove fetchConfigured patch
This commit is contained in:
parent
60f322d4a6
commit
6bdfd4c3f2
2 changed files with 1 additions and 46 deletions
4
third_party/nixpkgs/copy.bara.sky
vendored
4
third_party/nixpkgs/copy.bara.sky
vendored
|
@ -15,9 +15,7 @@ core.workflow(
|
||||||
]),
|
]),
|
||||||
authoring = authoring.pass_thru("Default email <noreply+nixpkgs@lukegb.com>"),
|
authoring = authoring.pass_thru("Default email <noreply+nixpkgs@lukegb.com>"),
|
||||||
transformations = [
|
transformations = [
|
||||||
patch.apply(patches = [
|
patch.apply(patches = []),
|
||||||
"patches/0001-buildBazelPackage-fetchConfigured.patch",
|
|
||||||
]),
|
|
||||||
core.move("", "third_party/nixpkgs"),
|
core.move("", "third_party/nixpkgs"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
# HG changeset patch
|
|
||||||
# User Luke Granger-Brown <hg@lukegb.com>
|
|
||||||
# Date 1589643462 -3600
|
|
||||||
# Sat May 16 16:37:42 2020 +0100
|
|
||||||
# Node ID 97b0de0407d168dd225c6642cdb73fb7bc13546a
|
|
||||||
# Parent 18763eabcdc1624fd96ce7245bc141f9ef4fd81c
|
|
||||||
third_party/nixpkgs: buildBazelPackage: add "fetchConfigured", and allow removing things that sometimes don't exist
|
|
||||||
|
|
||||||
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
|
|
||||||
--- a/pkgs/build-support/build-bazel-package/default.nix
|
|
||||||
+++ b/pkgs/build-support/build-bazel-package/default.nix
|
|
||||||
@@ -30,6 +30,13 @@ args@{
|
|
||||||
, removeRulesCC ? true
|
|
||||||
, removeLocalConfigCc ? true
|
|
||||||
, removeLocal ? true
|
|
||||||
+
|
|
||||||
+# Use build --nobuild instead of fetch. This allows fetching the dependencies
|
|
||||||
+# required for the build as configured, rather than fetching all the dependencies
|
|
||||||
+# which may not work in some situations (e.g. Java code which ends up relying on
|
|
||||||
+# Debian-specific /usr/share/java paths, but doesn't in the configured build).
|
|
||||||
+, fetchConfigured ? true
|
|
||||||
+
|
|
||||||
, ...
|
|
||||||
}:
|
|
||||||
|
|
||||||
@@ -77,7 +84,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|
||||||
bazel \
|
|
||||||
--output_base="$bazelOut" \
|
|
||||||
--output_user_root="$bazelUserRoot" \
|
|
||||||
- fetch \
|
|
||||||
+ ${if fetchConfigured then "build --nobuild" else "fetch"} \
|
|
||||||
--loading_phase_threads=1 \
|
|
||||||
$bazelFlags \
|
|
||||||
$bazelFetchFlags \
|
|
||||||
@@ -110,7 +117,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|
||||||
# platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms
|
|
||||||
find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
|
|
||||||
name="$(basename "$symlink")"
|
|
||||||
- rm "$symlink" "$bazelOut/external/@$name.marker"
|
|
||||||
+ rm -f "$symlink" "$bazelOut/external/@$name.marker"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Patching symlinks to remove build directory reference
|
|
Loading…
Reference in a new issue