summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers
diff options
context:
space:
mode:
authorTom Hunger <tehunger@gmail.com>2016-09-21 13:40:30 +0100
committerTom Hunger <tehunger@gmail.com>2016-09-21 18:42:43 +0100
commit93c773391d080bb044df0bdac1885c1d48923f23 (patch)
treee9aec6ff788dac685b122848255ca24fbe9670ed /pkgs/development/tools/build-managers
parent1cb54e39f0a8cf0eaccbbf9d5a849a3b7a4e04c8 (diff)
downloadnixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar.gz
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar.bz2
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar.lz
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar.xz
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.tar.zst
nixlib-93c773391d080bb044df0bdac1885c1d48923f23.zip
bazel: 20150326.981b7bc1 -> 0.3.1
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix19
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e49697084e45..002d3bde201e 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -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