mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
Merge pull request #168585 from s1341/bionic_prebuilt_add_x86_64_support
bionic_prebuilt: add x86_64 support
This commit is contained in:
commit
1adb8c6d9b
1 changed files with 37 additions and 15 deletions
|
@ -4,23 +4,44 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
||||||
prebuilt_crt = fetchzip {
|
prebuilt_crt = {
|
||||||
url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz";
|
aarch64 = fetchzip {
|
||||||
sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc=";
|
url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz";
|
||||||
stripRoot = false;
|
sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc=";
|
||||||
};
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
x86_64 = fetchzip {
|
||||||
|
url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/+archive/7e8507d2a2d4df3bced561b894576de70f065be4/lib/gcc/x86_64-linux-android/4.9.x.tar.gz";
|
||||||
|
sha256 = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw=";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||||
|
|
||||||
prebuilt_libs = fetchzip {
|
prebuilt_libs = {
|
||||||
url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz";
|
aarch64 = fetchzip {
|
||||||
sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw=";
|
url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz";
|
||||||
stripRoot = false;
|
sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw=";
|
||||||
};
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
x86_64 = fetchzip {
|
||||||
|
url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-x86_64/usr/lib64.tar.gz";
|
||||||
|
sha256 = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs=";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||||
|
|
||||||
prebuilt_ndk_crt = fetchzip {
|
prebuilt_ndk_crt = {
|
||||||
url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz";
|
aarch64 = fetchzip {
|
||||||
sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE=";
|
url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz";
|
||||||
stripRoot = false;
|
sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE=";
|
||||||
};
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
x86_64 = fetchzip {
|
||||||
|
url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/30.tar.gz";
|
||||||
|
sha256 = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk=";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
}.${stdenv.targetPlatform.parsed.cpu.name};
|
||||||
|
|
||||||
ndk_support_headers = fetchzip {
|
ndk_support_headers = fetchzip {
|
||||||
url ="https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz";
|
url ="https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz";
|
||||||
|
@ -41,6 +62,7 @@ in
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "bionic-prebuilt";
|
pname = "bionic-prebuilt";
|
||||||
version = "ndk-release-r23";
|
version = "ndk-release-r23";
|
||||||
|
name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz";
|
url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz";
|
||||||
|
|
Loading…
Reference in a new issue