public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41911 from uri-canva/bazelrc-stuff 

bazel: fix darwin build
This commit is contained in:
Matthew Justin Bauer 2018-06-17 01:15:41 -04:00 committed by GitHub
parent 9aa1624e83 8bf1a5c469
commit 9370818f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
extern char **environ; extern char **environ;
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
printf("environ: %s\n", environ[0]);
char *path = getenv("PATH"); char *path = getenv("PATH");
char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; char *pathToAppend = "${lib.makeBinPath [ coreutils ]}";
char *newPath; 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 find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
substituteInPlace "$path" \ substituteInPlace "$path" \
--replace /bin/bash ${customBash}/bin/bash \ --replace /bin/bash ${customBash}/bin/bash \
--replace /usr/bin/env ${coreutils}/bin/env --replace /usr/bin/env ${coreutils}/bin/env
done 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 . patchShebangs .
''; '';