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

Merge pull request #9008 from philandstuff/fix-bazel

Browse Source 
Fix bazel package
This commit is contained in:
lethalman 2015-08-06 11:47:54 +02:00
commit dad54b36fb
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 { stdenv.mkDerivation rec {
name = "bazel-20150326.981b7bc1"; name = "bazel-20150326.981b7bc1";
@ -10,19 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
}; };
buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ];
installPhase = '' installPhase = ''
PROTOC=protoc bash compile.sh PROTOC=protoc bash compile.sh
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
cp -R output $out/share/bazel cp -R output $out/share/bazel
ln -s $out/share/bazel/bazel $out/bin/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 = { meta = {
homepage = http://github.com/google/bazel/; homepage = http://github.com/google/bazel/;
description = "Build tool that builds code quickly and reliably"; description = "Build tool that builds code quickly and reliably";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.philandstuff ];
}; };
} }

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

@ -5311,7 +5311,7 @@ let
bam = callPackage ../development/tools/build-managers/bam {}; 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 { }; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };