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

Merge pull request #19400 from benley/bazel-linux-i686

Browse Source 
bazel: Allow linux i686 builds too
This commit is contained in:
Jörg Thalheim 2016-10-09 21:36:06 +02:00 committed by GitHub
commit e3ed2a5df9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -10,7 +10,7 @@ let
description = "Build tool that builds code quickly and reliably"; description = "Build tool that builds code quickly and reliably";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.philandstuff ]; maintainers = [ maintainers.philandstuff ];
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
}; };
bootstrapEnv = buildFHSUserEnv { bootstrapEnv = buildFHSUserEnv {
@ -23,7 +23,7 @@ let
bazelBinary = stdenv.mkDerivation rec { bazelBinary = stdenv.mkDerivation rec {
name = "bazel-${version}"; name = "bazel-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "bazel"; repo = "bazel";
@ -48,11 +48,11 @@ let
export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH"
./compile.sh ./compile.sh
''; '';
buildPhase = '' buildPhase = ''
bazel-bootstrap-env ${buildWrapper} bazel-bootstrap-env ${buildWrapper}
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp output/bazel $out/bin/ cp output/bazel $out/bin/
@ -60,10 +60,10 @@ let
--suffix PATH ":" "${runTimeBinPath}" \ --suffix PATH ":" "${runTimeBinPath}" \
--suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}" --suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}"
''; '';
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
inherit meta; inherit meta;
}; };