Unverified Commit 822db74b authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #254769 from alyssais/nftables-noninteractive 

nftables: add option to disable interactive
parents ec985f54 1e0e8df1

pkgs/os-specific/linux/nftables/default.nix

+6 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, bison, flex

, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl

, libmnl, libnftnl, libpcap

, gmp, jansson, libedit

, gmp, jansson

, autoreconfHook

, withDebugSymbols ? false

, withCli ? true, libedit

, withPython ? false, python3

, withXtables ? true, iptables

, nixosTests
@@ -26,8 +27,9 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    libmnl libnftnl libpcap

    gmp jansson libedit

  ] ++ lib.optional withXtables iptables

    gmp jansson

  ] ++ lib.optional withCli libedit

    ++ lib.optional withXtables iptables

    ++ lib.optionals withPython [

      python3

      python3.pkgs.setuptools
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec { 


  configureFlags = [

    "--with-json"

    "--with-cli=editline"

    (lib.withFeatureAs withCli "cli" "editline")

  ] ++ lib.optional (!withDebugSymbols) "--disable-debug"

    ++ lib.optional (!withPython) "--disable-python"

    ++ lib.optional withPython "--enable-python"