bazel: distinguish darwin patches from generic patches
The '' + '' somewhere in the middle is easily missed and extremely inelegant. Also removes unnecessary `stdenv` qualifiers from calls to `lib`.
This commit is contained in:
Profpatsch
parent
343e10aaa6
commit
c53e004257
|
|
@ -9,7 +9,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
srcDeps = stdenv.lib.singleton (
|
srcDeps = lib.singleton (
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
|
url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
|
||||||
sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
|
sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
|
||||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
version = "0.15.2";
|
version = "0.15.2";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/bazelbuild/bazel/";
|
homepage = "https://github.com/bazelbuild/bazel/";
|
||||||
description = "Build tool that builds code quickly and reliably";
|
description = "Build tool that builds code quickly and reliably";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
|
|
@ -74,71 +74,75 @@ stdenv.mkDerivation rec {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
|
postPatch = let
|
||||||
# Disable Bazel's Xcode toolchain detection which would configure compilers
|
darwinPatches = ''
|
||||||
# and linkers from Xcode instead of from PATH
|
# Disable Bazel's Xcode toolchain detection which would configure compilers
|
||||||
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
|
# and linkers from Xcode instead of from PATH
|
||||||
|
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
|
||||||
|
|
||||||
# Framework search paths aren't added by bintools hook
|
# Framework search paths aren't added by bintools hook
|
||||||
# https://github.com/NixOS/nixpkgs/pull/41914
|
# https://github.com/NixOS/nixpkgs/pull/41914
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
|
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
|
||||||
|
|
||||||
# libcxx includes aren't added by libcxx hook
|
# libcxx includes aren't added by libcxx hook
|
||||||
# https://github.com/NixOS/nixpkgs/pull/41589
|
# https://github.com/NixOS/nixpkgs/pull/41589
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
|
||||||
|
|
||||||
# don't use system installed Xcode to run clang, use Nix clang instead
|
# don't use system installed Xcode to run clang, use Nix clang instead
|
||||||
sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
|
sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
|
||||||
scripts/bootstrap/compile.sh \
|
scripts/bootstrap/compile.sh \
|
||||||
src/tools/xcode/realpath/BUILD \
|
src/tools/xcode/realpath/BUILD \
|
||||||
src/tools/xcode/stdredirect/BUILD \
|
src/tools/xcode/stdredirect/BUILD \
|
||||||
tools/osx/BUILD
|
tools/osx/BUILD
|
||||||
|
|
||||||
# clang installed from Xcode has a compatibility wrapper that forwards
|
# clang installed from Xcode has a compatibility wrapper that forwards
|
||||||
# invocations of gcc to clang, but vanilla clang doesn't
|
# invocations of gcc to clang, but vanilla clang doesn't
|
||||||
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
|
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
|
||||||
|
|
||||||
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
|
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
|
||||||
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
|
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
|
||||||
for wrapper in "''${wrappers[@]}"; do
|
for wrapper in "''${wrappers[@]}"; do
|
||||||
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
||||||
done
|
done
|
||||||
'' + ''
|
'';
|
||||||
find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
|
genericPatches = ''
|
||||||
substituteInPlace "$path" \
|
find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
|
||||||
--replace /bin/bash ${customBash}/bin/bash \
|
substituteInPlace "$path" \
|
||||||
--replace /usr/bin/env ${coreutils}/bin/env
|
--replace /bin/bash ${customBash}/bin/bash \
|
||||||
done
|
--replace /usr/bin/env ${coreutils}/bin/env
|
||||||
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
done
|
||||||
substituteInPlace scripts/bootstrap/compile.sh \
|
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
||||||
--replace /bin/sh ${customBash}/bin/bash
|
substituteInPlace scripts/bootstrap/compile.sh \
|
||||||
|
--replace /bin/sh ${customBash}/bin/bash
|
||||||
|
|
||||||
echo "build --experimental_distdir=${distDir}" >> .bazelrc
|
echo "build --experimental_distdir=${distDir}" >> .bazelrc
|
||||||
echo "fetch --experimental_distdir=${distDir}" >> .bazelrc
|
echo "fetch --experimental_distdir=${distDir}" >> .bazelrc
|
||||||
echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc
|
echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc
|
||||||
echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
|
echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
|
||||||
echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
|
echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
|
||||||
echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
|
echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
|
||||||
sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
|
sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
|
||||||
sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
|
sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
|
||||||
sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
|
sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
|
||||||
sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
|
sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
|
||||||
|
|
||||||
# --experimental_strict_action_env (which will soon become the
|
# --experimental_strict_action_env (which will soon become the
|
||||||
# default, see bazelbuild/bazel#2574) hardcodes the default
|
# default, see bazelbuild/bazel#2574) hardcodes the default
|
||||||
# action environment to a value that on NixOS at least is bogus.
|
# action environment to a value that on NixOS at least is bogus.
|
||||||
# So we hardcode it to something useful.
|
# So we hardcode it to something useful.
|
||||||
substituteInPlace \
|
substituteInPlace \
|
||||||
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
|
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
|
||||||
--replace /bin:/usr/bin ${defaultShellPath}
|
--replace /bin:/usr/bin ${defaultShellPath}
|
||||||
|
|
||||||
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
|
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
|
||||||
echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp
|
echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp
|
||||||
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
|
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
|
||||||
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
|
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
|
||||||
|
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
|
||||||
|
+ genericPatches;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
jdk
|
jdk
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue