From c90b0830e54a373327239773df315d9ddc1422ab Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 7 Oct 2024 17:11:21 -0400 Subject: [PATCH] boost-build: drop Darwin compiler substitution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream defaults to clang on Darwin now instead of GCC. This substitution doesn’t do anything. --- pkgs/development/tools/boost-build/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index fe8f1a4682fe..7a42df152829 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -36,11 +36,7 @@ stdenv.mkDerivation { patches = useBoost.boostBuildPatches or [] ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch; - # Upstream defaults to gcc on darwin, but we use clang. - postPatch = '' - substituteInPlace src/build-system.jam \ - --replace "default-toolset = darwin" "default-toolset = clang-darwin" - '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' + postPatch = lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' patchShebangs --build src/engine/build.sh '';