diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
| commit | 446fec8c2dda7ab24783713f16092803b7b1e464 (patch) | |
| tree | bda175eabb91dd480448aa3c24875de73640e8a4 /pkgs/development/tools/build-managers | |
| parent | 99de1a8ebb9df72642c259de63c4f0d2d1c770e7 (diff) | |
| parent | 97da2d22fed6b55d331c565a5817e97d74063397 (diff) | |
| download | nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.gz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.bz2 nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.lz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.xz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.zst nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.zip | |
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 49d7287087fd..e4d4994a7814 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -10,11 +10,12 @@ let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamilies = { - aarch64 = "aarch64"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; + aarch64 = "aarch64"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; }; in python3Packages.buildPythonApplication rec { |