diff options
author | lethalman <lucabru@src.gnome.org> | 2015-08-06 11:47:54 +0200 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-08-06 11:47:54 +0200 |
commit | dad54b36fbc0635c99523e585ef0808aff4f5db5 (patch) | |
tree | 51f2347f3c6c3d291282cfb37f960b7c7feb7b32 /pkgs/development | |
parent | 00821f40465063bc85aff9687c35a38a89a1038b (diff) | |
parent | 76dd430cd87c1fe9d859843c5d228abbdc7923bb (diff) | |
download | nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar.gz nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar.bz2 nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar.lz nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar.xz nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.tar.zst nixlib-dad54b36fbc0635c99523e585ef0808aff4f5db5.zip |
Merge pull request #9008 from philandstuff/fix-bazel
Fix bazel package
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e9ddc17bb026..ff23390d79ca 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -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 ]; }; } |