public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86283 from Ericson2314/fix-mistakes

Browse Source 
meson: Fix my mistakes
This commit is contained in:
John Ericson 2020-04-29 10:02:54 -04:00 committed by GitHub
commit e9d8303727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -3,6 +3,7 @@
, stdenv , stdenv
, writeTextDir , writeTextDir
, substituteAll , substituteAll
, pkgsHostHost
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -58,6 +59,10 @@ python3Packages.buildPythonApplication rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
# Ensure there will always be a native C compiler when meson is used, as a
# workaround until https://github.com/mesonbuild/meson/pull/6512 lands.
depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ];
# 0.45 update enabled tests but they are failing # 0.45 update enabled tests but they are failing
doCheck = false; doCheck = false;
# checkInputs = [ ninja pkgconfig ]; # checkInputs = [ ninja pkgconfig ];

4
pkgs/stdenv/generic/make-derivation.nix
View File

@ -257,8 +257,8 @@ in rec {
mesonFlags = if mesonFlags == null then null else let mesonFlags = if mesonFlags == null then null else let
# See https://mesonbuild.com/Reference-tables.html#cpu-families # See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamily = platform: with platform; cpuFamily = platform: with platform;
/**/ if isAarch64 then "arm" /**/ if isAarch32 then "arm"
else if isAarch32 then "aarch64" else if isAarch64 then "aarch64"
else if isx86_32 then "x86" else if isx86_32 then "x86"
else if isx86_64 then "x86_64" else if isx86_64 then "x86_64"
else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;