Skip to content

Commit

Permalink
Use --with-boost on macOS
Browse files Browse the repository at this point in the history
`configureFlags` only included `--with-boost` on Linux, which makes
local builds as outlined in `doc/manual/src/contributing/hacking.md`
fail when performed on macOS.
  • Loading branch information
9999years committed Dec 13, 2023
1 parent 1e3d811 commit 6ed8037
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,9 @@ in {
] ++ lib.optionals installUnitTests [
"--with-check-bin-dir=${builtins.placeholder "check"}/bin"
"--with-check-lib-dir=${builtins.placeholder "check"}/lib"
] ++ lib.optionals (doBuild && stdenv.isLinux) [
] ++ lib.optionals (doBuild) [
"--with-boost=${boost}/lib"
] ++ lib.optionals (doBuild && stdenv.isLinux) [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
] ++ lib.optional (doBuild && stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux"))
"LDFLAGS=-fuse-ld=gold"
Expand Down

0 comments on commit 6ed8037

Please sign in to comment.