forked from mirrors/nixpkgs
nftables: 1.0.1 -> 1.0.2
This commit is contained in:
parent
fe8e8ad112
commit
18c72c223a
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, bison, file, flex
|
||||
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
|
||||
, libmnl, libnftnl, libpcap
|
||||
, gmp, jansson, readline
|
||||
, gmp, jansson, libedit
|
||||
, autoreconfHook, fetchpatch
|
||||
, withDebugSymbols ? false
|
||||
, withPython ? false , python3
|
||||
, withXtables ? true , iptables
|
||||
|
@ -10,22 +11,23 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pname = "nftables";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
|
||||
sha256 = "08x4xw0s5sap3q7jfr91v7mrkxrydi4dvsckw85ims0qb1ibmviw";
|
||||
sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config bison file flex
|
||||
asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libmnl libnftnl libpcap
|
||||
gmp jansson readline
|
||||
gmp jansson libedit
|
||||
] ++ optional withXtables iptables
|
||||
++ optional withPython python3;
|
||||
|
||||
|
@ -33,9 +35,17 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# fix build after 1.0.2 release, drop when updating to a newer release
|
||||
(fetchpatch {
|
||||
url = "https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3";
|
||||
sha256 = "03dzhd7fhg0d20ly4rffk4ra7wlxp731892dhp8zw67jwhys9ywz";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-json"
|
||||
"--with-cli=readline" # TODO: maybe switch to editline
|
||||
"--with-cli=editline"
|
||||
] ++ optional (!withDebugSymbols) "--disable-debug"
|
||||
++ optional (!withPython) "--disable-python"
|
||||
++ optional withPython "--enable-python"
|
||||
|
|
Loading…
Reference in a new issue