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

bazel: Upstream pushed patch, removing patch.

This commit is contained in:
Rob Vermaas 2015-03-26 09:46:15 +00:00
parent e42547d8e9
commit ac35d15bcc
1 changed files with 2 additions and 5 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,21 +1,18 @@
{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }: { stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bazel-20150325.9a0dc1b2"; name = "bazel-20150326.981b7bc1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "bazel"; repo = "bazel";
rev = "9a0dc1b2"; rev = "981b7bc1";
sha256 = "1bgx12bnrqxz720ljn7kdzd4678p4mxldiylll3h0v5673vgrf5p"; sha256 = "1bgx12bnrqxz720ljn7kdzd4678p4mxldiylll3h0v5673vgrf5p";
}; };
buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ];
installPhase = '' installPhase = ''
# apply patch suggested by bazel people, remove when added upstream
sed -i 's/open(path.c_str(), O_CREAT | O_WRONLY, archive_entry_perm(entry))/open(path.c_str(), O_CREAT | O_WRONLY, 0755)/' ./src/main/cpp/blaze.cc
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