From dcdeefd9c27dee397c57faca82d899adae5a10d4 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 14 Oct 2024 15:54:04 -0700 Subject: [PATCH] [backport 2.91] 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 (cherry picked from commit a020f5f6cb5b38a3d867381869168e89aaa02ae1) --- package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.nix b/package.nix index 295e9139f..3230ef271 100644 --- a/package.nix +++ b/package.nix @@ -30,6 +30,8 @@ lix-clang-tidy ? null, llvmPackages, lsof, + # FIXME: remove default after dropping NixOS 24.05 + lowdown-unsandboxed ? lowdown, lowdown, mdbook, mdbook-linkcheck, @@ -221,7 +223,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ] ++ [ - (lib.getBin lowdown) + (lib.getBin lowdown-unsandboxed) mdbook mdbook-linkcheck ]