diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-17 01:15:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-17 01:15:41 -0400 |
commit | 9370818f0eab19675258b328195db17a7d7ba396 (patch) | |
tree | fd74d526012235a1afc78d95582d1257250e6f6b /pkgs/development/tools | |
parent | 9aa1624e8326ebba29d3d5305a6b468571c11538 (diff) | |
parent | 8bf1a5c4692fcd0fc2487cad3144ca5482b2729b (diff) | |
download | nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar.gz nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar.bz2 nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar.lz nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar.xz nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.tar.zst nixpkgs-9370818f0eab19675258b328195db17a7d7ba396.zip |
Merge pull request #41911 from uri-canva/bazelrc-stuff
bazel: fix darwin build
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e641e69bae6..94100423401 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { extern char **environ; int main(int argc, char *argv[]) { - printf("environ: %s\n", environ[0]); char *path = getenv("PATH"); char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; char *newPath; @@ -57,12 +56,22 @@ stdenv.mkDerivation rec { } ''; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + '' + '' find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + 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 --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 + sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; |