BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bazel: fix build, make compatible with openjdk

Browse source 
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
This commit is contained in:
Philip Potter 2015-07-26 21:45:32 +01:00
parent a20470ee33
commit 76dd430cd8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/tools/build-managers/bazel/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }:
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }:
stdenv.mkDerivation rec {
name = "bazel-20150326.981b7bc1";
@ -10,19 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
};
buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ];
buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ];
installPhase = ''
PROTOC=protoc bash compile.sh
mkdir -p $out/bin $out/share
cp -R output $out/share/bazel
ln -s $out/share/bazel/bazel $out/bin/bazel
wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}"
wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}"
'';
meta = {
homepage = http://github.com/google/bazel/;
description = "Build tool that builds code quickly and reliably";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.philandstuff ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -5283,7 +5283,7 @@ let
bam = callPackage ../development/tools/build-managers/bam {};
bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; };
bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; };
bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };