aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-10-14 15:54:04 -0700
committerJade Lovelace <lix@jade.fyi>2024-10-14 16:49:16 -0700
commita020f5f6cb5b38a3d867381869168e89aaa02ae1 (patch)
treef27fc86c39a1203e0b36a06bc829eb2de5467fd2
parent326cbecb61d42ce73caa391cdcb21acb2581bf7c (diff)
fix: macOS build broken by fatal lowdown CLI sandbox setup
This failed due to https://github.com/NixOS/nixpkgs/pull/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
-rw-r--r--package.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/package.nix b/package.nix
index 2d485be93..e869fb74f 100644
--- a/package.nix
+++ b/package.nix
@@ -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,
@@ -253,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: {
capnproto-lix
]
++ [
- (lib.getBin lowdown)
+ (lib.getBin lowdown-unsandboxed)
mdbook
mdbook-linkcheck
]