diff options
| author | John Ericson <git@JohnEricson.me> | 2020-11-15 14:18:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-15 14:18:15 -0500 |
| commit | 5bafec36ef084a8f7437a2da35768ca38b4c2bfb (patch) | |
| tree | f5ddfbf839a2ae1404d42d18ba2f82f0375bcbaa /pkgs/development/tools/build-managers/meson/default.nix | |
| parent | d686ded08ce6b38dbb8316c46f505907a2a2a3ad (diff) | |
| parent | f60fc7f61f6dc0a1b4631e3c5f913d53d7863293 (diff) | |
| download | nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar.gz nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar.bz2 nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar.lz nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar.xz nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.tar.zst nixpkgs-5bafec36ef084a8f7437a2da35768ca38b4c2bfb.zip | |
Merge pull request #99176 from Ericson2314/meson-remove-extra-cc
meson: Remove propagated native C compiler
Diffstat (limited to 'pkgs/development/tools/build-managers/meson/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 32948adfb6c..cd506b970f6 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,7 +3,6 @@ , stdenv , writeTextDir , substituteAll -, pkgsHostHost , fetchpatch }: @@ -61,10 +60,6 @@ python3.pkgs.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 ]; |