diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-02-04 18:43:43 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 18:43:43 -0300 |
| commit | 2c77d453e3f7bb8db753b1d4c18912634eb26435 (patch) | |
| tree | bf471806347a6eb15a2139f5a74d00e70b927530 /pkgs/stdenv | |
| parent | cfaa519ad41e831b600371547a7889507b5c0abf (diff) | |
| parent | b6304bf11dd14fe0b278b7e78dfdfa94f7cfa1dc (diff) | |
| download | nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar.gz nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar.bz2 nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar.lz nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar.xz nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.tar.zst nixpkgs-2c77d453e3f7bb8db753b1d4c18912634eb26435.zip | |
Merge pull request #213633 from alyssais/mkDerivation-meson-exotic
stdenv.mkDerivation: fix meson for some archs
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 517cfc03aea..08bd836e10e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -392,10 +392,8 @@ else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + else platform.uname.processor; crossFile = builtins.toFile "cross-file.conf" '' [properties] |