Merge pull request #18809 from teh/bazel-update

bazel: 20150326.981b7bc1 -> 0.3.1
This commit is contained in:
Benjamin Staffin 2016-09-22 02:28:10 -04:00 committed by GitHub
commit a28b8ec771
2 changed files with 13 additions and 8 deletions

View file

@ -1,19 +1,24 @@
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }:
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf3_0, pkgconfig, libarchive, unzip, which, makeWrapper }:
stdenv.mkDerivation rec {
name = "bazel-20150326.981b7bc1";
version = "0.3.1";
name = "bazel-${version}";
src = fetchFromGitHub {
owner = "google";
repo = "bazel";
rev = "981b7bc1";
sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
rev = version;
sha256 = "1cm8zjxf8y3ai6h9wndxvflfsijjqhg87fll9ar7ff0hbbbdf6l5";
};
buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ];
buildInputs = [ pkgconfig protobuf3_0 zlib zip libarchive unzip which makeWrapper jdk ];
buildPhase = ''
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
bash compile.sh
'';
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

View file

@ -6208,7 +6208,7 @@ in
bam = callPackage ../development/tools/build-managers/bam {};
bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; };
bazel = callPackage ../development/tools/build-managers/bazel { };
bear = callPackage ../development/tools/build-managers/bear { };