From 0c60efce693fff61fb7c38fb32aac3510551c7e8 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Wed, 23 Oct 2024 07:29:52 +0000 Subject: [PATCH] boost1{75,77,78,79}: fix build condition a substituteInPlace only on boost 180 and above and add one substituteInPlace back to the only consumer, boost175. updates change 90df0c3ed8794b60e95bb105674dd3f6d7f81972 --- pkgs/development/tools/boost-build/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 2a82642e778d..25911809695e 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -36,10 +36,13 @@ stdenv.mkDerivation { patches = useBoost.boostBuildPatches or [] ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch; - postPatch = '' + postPatch = lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.80") '' # Upstream uses arm64, but nixpkgs uses aarch64. substituteInPlace src/tools/clang.jam \ --replace-fail 'arch = arm64' 'arch = aarch64' + '' + lib.optionalString (useBoost ? version && lib.versionOlder useBoost.version "1.77") '' + substituteInPlace src/build-system.jam \ + --replace-fail "default-toolset = darwin" "default-toolset = clang-darwin" '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' patchShebangs --build src/engine/build.sh '';