puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Use --with-boost on macOS

Browse source 
`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.
This commit is contained in:
Rebecca Turner 2023-12-13 14:02:52 -08:00
parent 1e3d811840
commit 6ed803737c
Signed by: rbt
SSH key fingerprint: SHA256:SiNaEWabvotTldoNb5jIKqjJ3RnpS4aRXA4KLAdW5vs
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package.nix
View file

@ -284,8 +284,9 @@ in {
] ++ lib.optionals installUnitTests [ ] ++ lib.optionals installUnitTests [
"--with-check-bin-dir=${builtins.placeholder "check"}/bin" "--with-check-bin-dir=${builtins.placeholder "check"}/bin"
"--with-check-lib-dir=${builtins.placeholder "check"}/lib" "--with-check-lib-dir=${builtins.placeholder "check"}/lib"
] ++ lib.optionals (doBuild && stdenv.isLinux) [ ] ++ lib.optionals (doBuild) [
"--with-boost=${boost}/lib" "--with-boost=${boost}/lib"
] ++ lib.optionals (doBuild && stdenv.isLinux) [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
] ++ lib.optional (doBuild && stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) ] ++ lib.optional (doBuild && stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux"))
"LDFLAGS=-fuse-ld=gold" "LDFLAGS=-fuse-ld=gold"