diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-28 22:51:22 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-04-28 22:54:48 -0400 |
| commit | 38b084f621b51c721341331ae13e321010d8eebb (patch) | |
| tree | 75921db728a4a2c694c9fa97496d6e5acae5c28e /pkgs/development/tools/build-managers/meson | |
| parent | cf858e6d57c4753ca872ef9c24d2c31cb6a1204f (diff) | |
| download | nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar.gz nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar.bz2 nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar.lz nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar.xz nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.tar.zst nixpkgs-38b084f621b51c721341331ae13e321010d8eebb.zip | |
meson: Fix cross
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.
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3809d19e7d0..0eae4215d46 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,6 +3,7 @@ , stdenv , writeTextDir , substituteAll +, pkgsHostHost }: python3Packages.buildPythonApplication rec { @@ -58,6 +59,10 @@ python3Packages.buildPythonApplication rec { 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 doCheck = false; # checkInputs = [ ninja pkgconfig ]; |