From 2ef1e26ea5cdcf6a4e1ee522b1993308744e7c26 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 1 Apr 2023 10:17:58 +0000 Subject: [PATCH] pkgsStatic.iptables: fix build As a result of 8f45423217c ("libpcap: build with libnl"), the static build started to fail, because iptables didn't know to link with libnl. The patch makes iptables use pkg-config to find libpcap, which means it knows about other libraries that need to be linked when doing a static build. --- pkgs/os-specific/linux/iptables/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 930e876ec60d..9d2848556eaf 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison +{ lib, stdenv, fetchurl +, autoreconfHook, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? true , fetchpatch @@ -19,11 +20,18 @@ stdenv.mkDerivation rec { url = "https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc"; sha256 = "OdytFmHk+3Awu+sDQpGTl5/qip4doRblmW2vQzfNZiU="; }) + (fetchurl { + name = "static.patch"; + url = "https://lore.kernel.org/netfilter-devel/20230402232939.1060151-1-hi@alyssa.is/raw"; + sha256 = "PkH+1HbJjBb3//ffBe0XUQok1lBwgj/STL8Ppu/28f4="; + }) ]; outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; + nativeBuildInputs = [ + autoreconfHook pkg-config pruneLibtoolFiles flex bison + ]; buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ];