Merge pull request #9008 from philandstuff/fix-bazel

Fix bazel package

lethalman dad54b36 00821f40

Changed files
+5 -4
pkgs
development
tools
build-managers
bazel
top-level
+4 -3
pkgs/development/tools/build-managers/bazel/default.nix
···
-
{ 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";
···
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 ];
};
}
+1 -1
pkgs/top-level/all-packages.nix
···
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 { };