From 3c00ca03a251693e58eb4e3c247ee1f640215783 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 26 Apr 2020 16:31:49 -0400
Subject: [PATCH] meson: Don't set CC and CXX

I've since convinced upstream to not use such vars for the build
platform during cross. Finally!
---
 pkgs/development/tools/build-managers/meson/default.nix   | 2 --
 pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 15b0a5ffcd0d..977ffe837ec8 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -90,8 +90,6 @@ python3Packages.buildPythonApplication rec {
   # checkInputs = [ ninja pkgconfig ];
   # checkPhase = "python ./run_project_tests.py";
 
-  inherit (stdenv) cc;
-
   isCross = stdenv.targetPlatform != stdenv.hostPlatform;
 
   meta = with lib; {
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 8d76ecdaf32b..aef18e65ea1f 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -25,7 +25,7 @@ mesonConfigurePhase() {
 
     echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
 
-    CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}"
+    meson build $mesonFlags "${mesonFlagsArray[@]}"
     cd build
 
     if ! [[ -v enableParallelBuilding ]]; then