Merge pull request #120559 from jonringer/buck-jdk8

buck: use jdk8
This commit is contained in:
Mario Rodas 2021-04-24 21:21:21 -05:00 committed by GitHub
commit 4a1bad5db1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jdk8, ant, python3, watchman, bash, makeWrapper }:
stdenv.mkDerivation rec {
pname = "buck";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
'';
nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ];
nativeBuildInputs = [ makeWrapper python3 jdk8 ant watchman ];
buildPhase = ''
# Set correct version, see https://github.com/facebook/buck/issues/2607
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \
--prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}"
--prefix PATH : "${lib.makeBinPath [ jdk8 watchman python3 ]}"
'';
meta = with lib; {