nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 19:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

boost-build: make darwin patch work across all versions

Browse Source
This commit is contained in:
Hunter Jones 2021-10-11 12:59:20 -05:00
parent eca50883fc
commit b772490d9b
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/boost-build/darwin-default-toolset.patch
View File

@ -1,12 +0,0 @@
diff --git a/src/build-system.jam b/src/build-system.jam
index 60425c54..c6842217 100644
--- a/src/build-system.jam
+++ b/src/build-system.jam
@@ -644,7 +644,7 @@ local rule should-clean-project ( project )
}
else if [ os.name ] = MACOSX
{
- default-toolset = darwin ;
+ default-toolset = clang-darwin ;
}
}

9
pkgs/development/tools/boost-build/default.nix
View File

@ -33,10 +33,11 @@ stdenv.mkDerivation {
sourceRoot="$sourceRoot/tools/build"
'';
patches = [
# Upstream defaults to gcc on darwin, but we use clang.
./darwin-default-toolset.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"
'';
nativeBuildInputs = [
bison