diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
commit | 34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch) | |
tree | d3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /lib/systems/examples.nix | |
parent | ad17db3562766979371f0ae9cc0d2428f44a9d58 (diff) | |
parent | f1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff) | |
download | nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2 nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'lib/systems/examples.nix')
-rw-r--r-- | lib/systems/examples.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index bd68ee9460e7..848737700b0b 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -38,6 +38,13 @@ rec { platform = platforms.aarch64-multiplatform; }; + aarch64-android-prebuilt = rec { + config = "aarch64-unknown-linux-android"; + arch = "aarch64"; + platform = platforms.aarch64-multiplatform; + useAndroidPrebuilt = true; + }; + scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; inherit (platform.gcc) fpu; @@ -51,7 +58,7 @@ rec { }; fuloongminipc = rec { - config = "mips64el-unknown-linux-gnu"; + config = "mipsel-unknown-linux-gnu"; arch = "mips"; float = "hard"; platform = platforms.fuloong2f_n32; |