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

Merge pull request #99176 from Ericson2314/meson-remove-extra-cc

Browse Source 
meson: Remove propagated native C compiler
This commit is contained in:
John Ericson 2020-11-15 14:18:15 -05:00 committed by GitHub
commit 5bafec36ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 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,7 +3,6 @@
, stdenv , stdenv
, writeTextDir , writeTextDir
, substituteAll , substituteAll
, pkgsHostHost
, fetchpatch , fetchpatch
}: }:
@ -61,10 +60,6 @@ python3.pkgs.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 ];