From 11fca2e46f66b626b54611632a90093b79e376d4 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 3 Sep 2024 12:54:48 -0700 Subject: [PATCH 1/2] iptables: add meta.mainProgram --- pkgs/os-specific/linux/iptables/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index afaa91ca2f37e..29abc5aaed2f1 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2Plus; downloadPage = "https://www.netfilter.org/projects/iptables/files/"; + mainProgram = "iptables"; }; } From 13b899897c3a16250cfa77a95ee4d8540cad1930 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 3 Sep 2024 12:55:42 -0700 Subject: [PATCH 2/2] iptables: reformat --- pkgs/os-specific/linux/iptables/default.nix | 41 +++++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 29abc5aaed2f1..5289a954e4622 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,8 +1,19 @@ -{ lib, stdenv, fetchurl -, autoreconfHook, pkg-config, pruneLibtoolFiles, flex, bison -, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap -, nftablesCompat ? true -, gitUpdater +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, + pruneLibtoolFiles, + flex, + bison, + libmnl, + libnetfilter_conntrack, + libnfnetlink, + libnftnl, + libpcap, + nftablesCompat ? true, + gitUpdater, }: stdenv.mkDerivation rec { @@ -14,13 +25,27 @@ stdenv.mkDerivation rec { sha256 = "XMJVwYk1bjF9BwdVzpNx62Oht4PDRJj7jDAmTzzFnJw="; }; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ - autoreconfHook pkg-config pruneLibtoolFiles flex bison + autoreconfHook + pkg-config + pruneLibtoolFiles + flex + bison ]; - buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; + buildInputs = [ + libmnl + libnetfilter_conntrack + libnfnetlink + libnftnl + libpcap + ]; configureFlags = [ "--enable-bpf-compiler"