mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #19400 from benley/bazel-linux-i686
bazel: Allow linux i686 builds too
This commit is contained in:
commit
e3ed2a5df9
1 changed files with 6 additions and 6 deletions
|
@ -10,7 +10,7 @@ let
|
|||
description = "Build tool that builds code quickly and reliably";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.philandstuff ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
bootstrapEnv = buildFHSUserEnv {
|
||||
|
@ -23,7 +23,7 @@ let
|
|||
|
||||
bazelBinary = stdenv.mkDerivation rec {
|
||||
name = "bazel-${version}";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel";
|
||||
|
@ -48,11 +48,11 @@ let
|
|||
export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH"
|
||||
./compile.sh
|
||||
'';
|
||||
|
||||
|
||||
buildPhase = ''
|
||||
bazel-bootstrap-env ${buildWrapper}
|
||||
'';
|
||||
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp output/bazel $out/bin/
|
||||
|
@ -60,10 +60,10 @@ let
|
|||
--suffix PATH ":" "${runTimeBinPath}" \
|
||||
--suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}"
|
||||
'';
|
||||
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue