mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
treewide: use lowdown-unsandboxed where appropriate
This commit is contained in:
parent
dc32d18e52
commit
b370a686ca
@ -8,7 +8,7 @@
|
||||
, automake
|
||||
, gettext
|
||||
, libtool
|
||||
, lowdown
|
||||
, lowdown-unsandboxed
|
||||
, protobuf
|
||||
, unzip
|
||||
, which
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
# 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
|
||||
# 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 ];
|
||||
|
||||
buildInputs = [ gmp libsodium sqlite zlib jq ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, lowdown
|
||||
, lowdown-unsandboxed
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
nativeBuildInputs = [ lowdown ];
|
||||
nativeBuildInputs = [ lowdown-unsandboxed ];
|
||||
|
||||
postInstall = ''
|
||||
cd man
|
||||
|
@ -39,6 +39,7 @@ assert (hash == null) -> (src != null);
|
||||
libcpuid,
|
||||
libsodium,
|
||||
lowdown,
|
||||
lowdown-unsandboxed,
|
||||
lsof,
|
||||
mercurial,
|
||||
mdbook,
|
||||
@ -119,7 +120,7 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optionals isLegacyParser [ bison ]
|
||||
++ lib.optionals enableDocumentation [
|
||||
(lib.getBin lowdown)
|
||||
(lib.getBin lowdown-unsandboxed)
|
||||
mdbook
|
||||
mdbook-linkcheck
|
||||
doxygen
|
||||
|
@ -59,6 +59,7 @@ in
|
||||
, libxml2
|
||||
, libxslt
|
||||
, lowdown
|
||||
, lowdown-unsandboxed
|
||||
, toml11
|
||||
, man
|
||||
, mdbook
|
||||
@ -122,7 +123,7 @@ self = stdenv.mkDerivation {
|
||||
docbook_xsl_ns
|
||||
docbook5
|
||||
] ++ lib.optionals (enableDocumentation && atLeast24) [
|
||||
(lib.getBin lowdown)
|
||||
(lib.getBin lowdown-unsandboxed)
|
||||
mdbook
|
||||
] ++ lib.optionals (atLeast213 && enableDocumentation) [
|
||||
mdbook-linkcheck
|
||||
|
Loading…
Reference in New Issue
Block a user