Merge pull request #36911 from rasendubi/android-build-tools
androidenv.buildTools: 26.0.1 -> 26.0.2
This commit is contained in:
commit
d30f7a5aa8
@ -1,16 +1,16 @@
|
||||
{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "26.0.1";
|
||||
version = "26.0.2";
|
||||
name = "android-build-tools-r${version}";
|
||||
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
then fetchurl {
|
||||
url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
|
||||
sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8";
|
||||
sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7";
|
||||
}
|
||||
else if stdenv.system == "x86_64-darwin" then fetchurl {
|
||||
url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
|
||||
sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk";
|
||||
sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx";
|
||||
}
|
||||
else throw "System ${stdenv.system} not supported!";
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
cd $out/build-tools
|
||||
unzip $src
|
||||
mv android-* ${version}
|
||||
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
''
|
||||
cd ${version}
|
||||
@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
|
||||
fi
|
||||
done
|
||||
''}
|
||||
|
||||
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
||||
buildInputs = [ unzip file ];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user