Skip to content

Commit

Permalink
fix: macOS build broken by fatal lowdown CLI sandbox setup
Browse files Browse the repository at this point in the history
This failed due to NixOS/nixpkgs#346945, which
makes a second lowdown-unsandboxed that works in nix builds, and the
regular lowdown has executables that fail closed when the sandbox setup
fails.

The actual failure here is only visible on nixos-unstable at the moment,
not 24.05, but this commit should fix it up for all versions.

Fixes: https://git.lix.systems/lix-project/lix/issues/547
Change-Id: I50c0ecb59518ef01a7c0181114c1b4c5a7c6b78b
  • Loading branch information
lf- committed Oct 14, 2024
1 parent 326cbec commit a020f5f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
lix-clang-tidy ? null,
llvmPackages,
lsof,
# FIXME: remove default after dropping NixOS 24.05
lowdown-unsandboxed ? lowdown,
lowdown,
mdbook,
mdbook-linkcheck,
Expand Down Expand Up @@ -253,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: {
capnproto-lix
]
++ [
(lib.getBin lowdown)
(lib.getBin lowdown-unsandboxed)
mdbook
mdbook-linkcheck
]
Expand Down

0 comments on commit a020f5f

Please sign in to comment.