summary refs log tree commit diff
path: root/pkgs/stdenv/default.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-04-10 18:38:20 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-04-19 12:00:44 -0400
commitdd584d8eeb8c76d82cbac50ace0f7a08586a31e9 (patch)
tree445d463e83d5d912d197f6335b50a3fcce5e7a15 /pkgs/stdenv/default.nix
parent59bb1dcbfb81fee9b727200ffc064cc6b2f05d59 (diff)
downloadnixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar.gz
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar.bz2
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar.lz
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar.xz
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.tar.zst
nixpkgs-dd584d8eeb8c76d82cbac50ace0f7a08586a31e9.zip
stdenv/linux: use isCompatible to find bootstrap tools
This avoids part of the issue where things like armv7a don’t work
because the system doesn’t realize it can use the armv7l bootstrap
tools.
Diffstat (limited to 'pkgs/stdenv/default.nix')
-rw-r--r--pkgs/stdenv/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 4313a617f78..1f752f02152 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -43,8 +43,14 @@ in
     "x86_64-linux" = stagesLinux;
     "armv5tel-linux" = stagesLinux;
     "armv6l-linux" = stagesLinux;
+    "armv6m-linux" = stagesLinux;
     "armv7a-linux" = stagesLinux;
     "armv7l-linux" = stagesLinux;
+    "armv7r-linux" = stagesLinux;
+    "armv7m-linux" = stagesLinux;
+    "armv8a-linux" = stagesLinux;
+    "armv8r-linux" = stagesLinux;
+    "armv8m-linux" = stagesLinux;
     "aarch64-linux" = stagesLinux;
     "mipsel-linux" = stagesLinux;
     "powerpc-linux" = /* stagesLinux */ stagesNative;