pyrox.dev
bionic: fix evaluation on some platforms
Channel update scripts were blocked on this.
Conversion from hard errors to soft throws is significant.
+10
-6
pkgs/os-specific/linux/bionic-prebuilt/default.nix
+10
-6
pkgs/os-specific/linux/bionic-prebuilt/default.nix
···
4
4
}:
5
5
let
6
6
7
-
prebuilt_crt = {
7
+
choosePlatform =
8
+
let pname = stdenv.targetPlatform.parsed.cpu.name; in
9
+
pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}");
10
+
11
+
prebuilt_crt = choosePlatform {
8
12
aarch64 = fetchzip {
9
13
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";
10
14
sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc=";
···
15
19
sha256 = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw=";
16
20
stripRoot = false;
17
21
};
18
-
}.${stdenv.targetPlatform.parsed.cpu.name};
22
+
};
19
23
20
-
prebuilt_libs = {
24
+
prebuilt_libs = choosePlatform {
21
25
aarch64 = fetchzip {
22
26
url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz";
23
27
sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw=";
···
28
32
sha256 = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs=";
29
33
stripRoot = false;
30
34
};
31
-
}.${stdenv.targetPlatform.parsed.cpu.name};
35
+
};
32
36
33
-
prebuilt_ndk_crt = {
37
+
prebuilt_ndk_crt = choosePlatform {
34
38
aarch64 = fetchzip {
35
39
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";
36
40
sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE=";
···
41
45
sha256 = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk=";
42
46
stripRoot = false;
43
47
};
44
-
}.${stdenv.targetPlatform.parsed.cpu.name};
48
+
};
45
49
46
50
ndk_support_headers = fetchzip {
47
51
url ="https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz";