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

meson: Fix cross

Browse Source 
The old `CC=.. CXX= .. meson ...` env var hack I removed in
3c00ca03a251693e58eb4e3c247ee1f640215783 had a side effect of ensuring
that Meson always had access to a native C compiler, which unforunately
it expects in most cases. Thankfully, that will be fixed soon.
This commit is contained in:
John Ericson 2020-04-28 22:51:22 -04:00
parent cf858e6d57
commit 38b084f621
1 changed files with 5 additions and 0 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 ];