treewide: use lowdown-unsandboxed where appropriate

This commit is contained in:
Emily 2024-10-06 21:02:23 +01:00
parent dc32d18e52
commit b370a686ca
4 changed files with 8 additions and 6 deletions

View File

@ -8,7 +8,7 @@
, automake , automake
, gettext , gettext
, libtool , libtool
, lowdown , lowdown-unsandboxed
, protobuf , protobuf
, unzip , unzip
, which , which
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# when building on darwin we need cctools to provide the correct libtool # when building on darwin we need cctools to provide the correct libtool
# as libwally-core detects the host as darwin and tries to add the -static # as libwally-core detects the host as darwin and tries to add the -static
# option to libtool, also we have to add the modified gsed package. # option to libtool, also we have to add the modified gsed package.
nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown-unsandboxed protobuf py3 unzip which ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];
buildInputs = [ gmp libsodium sqlite zlib jq ]; buildInputs = [ gmp libsodium sqlite zlib jq ];

View File

@ -1,7 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, buildGoModule , buildGoModule
, lowdown , lowdown-unsandboxed
}: }:
buildGoModule rec { buildGoModule rec {
@ -19,7 +19,7 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ lowdown ]; nativeBuildInputs = [ lowdown-unsandboxed ];
postInstall = '' postInstall = ''
cd man cd man

View File

@ -39,6 +39,7 @@ assert (hash == null) -> (src != null);
libcpuid, libcpuid,
libsodium, libsodium,
lowdown, lowdown,
lowdown-unsandboxed,
lsof, lsof,
mercurial, mercurial,
mdbook, mdbook,
@ -119,7 +120,7 @@ stdenv.mkDerivation {
] ]
++ lib.optionals isLegacyParser [ bison ] ++ lib.optionals isLegacyParser [ bison ]
++ lib.optionals enableDocumentation [ ++ lib.optionals enableDocumentation [
(lib.getBin lowdown) (lib.getBin lowdown-unsandboxed)
mdbook mdbook
mdbook-linkcheck mdbook-linkcheck
doxygen doxygen

View File

@ -59,6 +59,7 @@ in
, libxml2 , libxml2
, libxslt , libxslt
, lowdown , lowdown
, lowdown-unsandboxed
, toml11 , toml11
, man , man
, mdbook , mdbook
@ -122,7 +123,7 @@ self = stdenv.mkDerivation {
docbook_xsl_ns docbook_xsl_ns
docbook5 docbook5
] ++ lib.optionals (enableDocumentation && atLeast24) [ ] ++ lib.optionals (enableDocumentation && atLeast24) [
(lib.getBin lowdown) (lib.getBin lowdown-unsandboxed)
mdbook mdbook
] ++ lib.optionals (atLeast213 && enableDocumentation) [ ] ++ lib.optionals (atLeast213 && enableDocumentation) [
mdbook-linkcheck mdbook-linkcheck