diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/tools/build-managers/meson | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers/meson')
-rw-r--r-- | nixpkgs/pkgs/development/tools/build-managers/meson/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 92a0ae3eb85b..638fd2eaa43f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -1,5 +1,15 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: +let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamilies = { + "aarch64" = "aarch64"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "x86"; + "x86_64" = "x86_64"; + }; +in python3Packages.buildPythonApplication rec { version = "0.49.2"; pname = "meson"; @@ -62,13 +72,15 @@ python3Packages.buildPythonApplication rec { ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' pkgconfig = 'pkg-config' + ld = '${targetPackages.stdenv.cc.targetPrefix}ld' + objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy' [properties] needs_exe_wrapper = true [host_machine] system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}' + cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; |