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

boost1{75,77,78,79}: fix build

Browse Source 
condition a substituteInPlace only on boost 180 and above and add one
substituteInPlace back to the only consumer, boost175.

updates change 90df0c3ed8
This commit is contained in:
Reno Dakota
2024-10-23 07:29:52 +00:00
parent a05b8fcd69
commit 0c60efce69
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/boost-build/default.nix
+4 -1
View File
@@ -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
'';