diff options
Diffstat (limited to 'pkgs/os-specific/linux/nftables/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/nftables/default.nix | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 051ca1963051b..8339eabb495ae 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, file, flex +{ lib, stdenv, fetchurl, pkg-config, bison, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, libedit -, autoreconfHook, fetchpatch +, autoreconfHook , withDebugSymbols ? false , withPython ? false , python3 , withXtables ? true , iptables }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b"; + hash = "sha256-kn+x/qH2haMowQz3ketlXX4e1J0xDupcsxAd/Y1sujU="; }; nativeBuildInputs = [ autoreconfHook - pkg-config bison file flex + pkg-config bison flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; @@ -29,18 +29,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional withXtables iptables ++ lib.optional withPython python3; - preConfigure = '' - 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=editline" |