summary refs log tree commit diff
path: root/pkgs/os-specific/bsd/netbsd/default.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-06-10 00:06:44 +0000
committerGitHub <noreply@github.com>2021-06-10 00:06:44 +0000
commitf8b7190a422733863d443b0175d65b4ce64ec267 (patch)
tree8cf963b9f0f0157dd10655198294718c69a09439 /pkgs/os-specific/bsd/netbsd/default.nix
parent6c3e91c6caac37df6a2f3257fe92871d9b2bdeda (diff)
parent8d9549f31c29c20fd36ebdcef38773cb7fcf6608 (diff)
downloadnixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar.gz
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar.bz2
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar.lz
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar.xz
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.tar.zst
nixpkgs-f8b7190a422733863d443b0175d65b4ce64ec267.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/bsd/netbsd/default.nix')
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 3e92cc9c951..bb0984d9738 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -67,6 +67,8 @@ in lib.makeScopeWithSplicing
     HOST_SH = stdenv'.shell;
 
     MACHINE_ARCH = {
+      i486 = "i386";
+      i586 = "i386";
       i686 = "i386";
     }.${stdenv'.hostPlatform.parsed.cpu.name}
       or stdenv'.hostPlatform.parsed.cpu.name;
@@ -74,6 +76,8 @@ in lib.makeScopeWithSplicing
     MACHINE = {
       x86_64 = "amd64";
       aarch64 = "evbarm64";
+      i486 = "i386";
+      i586 = "i386";
       i686 = "i386";
     }.${stdenv'.hostPlatform.parsed.cpu.name}
       or stdenv'.hostPlatform.parsed.cpu.name;