Merge pull request #254769 from alyssais/nftables-noninteractive
nftables: add option to disable interactive
This commit is contained in:
commit
822db74bdd
|
@ -1,9 +1,10 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, bison, flex
|
{ lib, stdenv, fetchurl, pkg-config, bison, flex
|
||||||
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
|
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
|
||||||
, libmnl, libnftnl, libpcap
|
, libmnl, libnftnl, libpcap
|
||||||
, gmp, jansson, libedit
|
, gmp, jansson
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, withDebugSymbols ? false
|
, withDebugSymbols ? false
|
||||||
|
, withCli ? true, libedit
|
||||||
, withPython ? false, python3
|
, withPython ? false, python3
|
||||||
, withXtables ? true, iptables
|
, withXtables ? true, iptables
|
||||||
, nixosTests
|
, nixosTests
|
||||||
|
@ -26,8 +27,9 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libmnl libnftnl libpcap
|
libmnl libnftnl libpcap
|
||||||
gmp jansson libedit
|
gmp jansson
|
||||||
] ++ lib.optional withXtables iptables
|
] ++ lib.optional withCli libedit
|
||||||
|
++ lib.optional withXtables iptables
|
||||||
++ lib.optionals withPython [
|
++ lib.optionals withPython [
|
||||||
python3
|
python3
|
||||||
python3.pkgs.setuptools
|
python3.pkgs.setuptools
|
||||||
|
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-json"
|
"--with-json"
|
||||||
"--with-cli=editline"
|
(lib.withFeatureAs withCli "cli" "editline")
|
||||||
] ++ lib.optional (!withDebugSymbols) "--disable-debug"
|
] ++ lib.optional (!withDebugSymbols) "--disable-debug"
|
||||||
++ lib.optional (!withPython) "--disable-python"
|
++ lib.optional (!withPython) "--disable-python"
|
||||||
++ lib.optional withPython "--enable-python"
|
++ lib.optional withPython "--enable-python"
|
||||||
|
|
Loading…
Reference in a new issue